diff --git a/demo/redirect-flow-example/package-lock.json b/demo/redirect-flow-example/package-lock.json
index 28b6448d..4db21182 100644
--- a/demo/redirect-flow-example/package-lock.json
+++ b/demo/redirect-flow-example/package-lock.json
@@ -9,8 +9,9 @@
       "version": "0.1.0",
       "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",
@@ -55,7 +56,7 @@
     },
     "../..": {
       "name": "@web3auth/mpc-core-kit",
-      "version": "3.2.6",
+      "version": "4.0.0-alpha.0",
       "license": "ISC",
       "dependencies": {
         "@tkey/common-types": "^15.1.0",
@@ -63,17 +64,17 @@
         "@tkey/share-serialization": "^15.1.0",
         "@tkey/storage-layer-torus": "^15.1.0",
         "@tkey/tss": "^15.1.0",
-        "@toruslabs/constants": "^14.0.0",
+        "@toruslabs/constants": "^14.2.0",
         "@toruslabs/customauth": "^20.3.0",
-        "@toruslabs/elliptic-wrapper": "^0.1.0",
-        "@toruslabs/fetch-node-details": "^14.0.1",
-        "@toruslabs/fnd-base": "^14.0.0",
+        "@toruslabs/elliptic-wrapper": "^0.1.1",
+        "@toruslabs/fetch-node-details": "^14.2.0",
+        "@toruslabs/fnd-base": "^14.2.0",
         "@toruslabs/metadata-helpers": "^6.0.0",
         "@toruslabs/openlogin-utils": "^8.2.1",
         "@toruslabs/session-manager": "^3.1.0",
-        "@toruslabs/torus.js": "file:./toruslabs-torus.js-15.1.2.tgz",
-        "@toruslabs/tss-client": "^3.1.0",
-        "@toruslabs/tss-frost-client": "0.3.1",
+        "@toruslabs/torus.js": "15.2.0-alpha.0",
+        "@toruslabs/tss-client": "^3.3.0-alpha.0",
+        "@toruslabs/tss-frost-client": "^1.0.0-alpha.0",
         "@toruslabs/tss-frost-common": "^1.0.1",
         "bn.js": "^5.2.1",
         "bowser": "^2.11.0",
@@ -82,11 +83,12 @@
       },
       "devDependencies": {
         "@babel/register": "^7.25.7",
+        "@noble/curves": "^1.6.0",
         "@toruslabs/config": "^2.2.0",
         "@toruslabs/eslint-config-typescript": "^3.3.3",
         "@toruslabs/torus-scripts": "^6.1.2",
-        "@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",
         "@types/chai": "^4.3.16",
         "@types/elliptic": "^6.4.18",
         "@types/jsonwebtoken": "^9.0.7",
@@ -115,8 +117,9 @@
       },
       "peerDependencies": {
         "@babel/runtime": "^7.x",
-        "@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"
       },
       "peerDependenciesMeta": {
         "@toruslabs/tss-dkls-lib": {
@@ -124,6 +127,9 @@
         },
         "@toruslabs/tss-frost-lib": {
           "optional": true
+        },
+        "@toruslabs/tss-frost-lib-bip340": {
+          "optional": true
         }
       }
     },
@@ -1666,14 +1672,19 @@
       }
     },
     "node_modules/@toruslabs/tss-dkls-lib": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/@toruslabs/tss-dkls-lib/-/tss-dkls-lib-4.1.0.tgz",
-      "integrity": "sha512-Iirs3uNigaYFSek/AqwSzsQovRzJaLVnmoGU5wC3/gpMTU9ZM4hLIconztRlSgfFmqcvxZWj+0JX1DnXyMmdXw=="
+      "version": "5.0.0-alpha.0",
+      "resolved": "https://registry.npmjs.org/@toruslabs/tss-dkls-lib/-/tss-dkls-lib-5.0.0-alpha.0.tgz",
+      "integrity": "sha512-htUWzL2JZoKTtw++WLdQ1AK3wPTe0yezv/twWjpQIzLFkkfoO9Urnl5n9S6jFx98Z1dDRJRBWSED9PSuqY/x7w=="
     },
     "node_modules/@toruslabs/tss-frost-lib": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@toruslabs/tss-frost-lib/-/tss-frost-lib-1.0.0.tgz",
-      "integrity": "sha512-uDsM7f6NiVvNKVOfTUK+CucZUy1TjvTSYvk5LL8t2i/izWzNbBg4NO9qAFws3Kp9Kt1hG0xo8FkWzh3+oJ82xA=="
+      "version": "2.0.0-alpha.0",
+      "resolved": "https://registry.npmjs.org/@toruslabs/tss-frost-lib/-/tss-frost-lib-2.0.0-alpha.0.tgz",
+      "integrity": "sha512-oZy99HiES3OR8t6rrV6ccxwbrq38kxzz1C/5UIdqUVd2IRSWZzrcD+J4Q2/yR5bDMoK1HrucLShK96uMoXyv/A=="
+    },
+    "node_modules/@toruslabs/tss-frost-lib-bip340": {
+      "version": "0.1.0-alpha.0",
+      "resolved": "https://registry.npmjs.org/@toruslabs/tss-frost-lib-bip340/-/tss-frost-lib-bip340-0.1.0-alpha.0.tgz",
+      "integrity": "sha512-2dK/fhIfkxdbI/WPCRc1nJlL81nu70VMJyj313eJbO6oU13S92YjzoIhiCvBn6G/F3XpftD44wqNkr+S3QbAuA=="
     },
     "node_modules/@toruslabs/tweetnacl-js": {
       "version": "1.0.4",
diff --git a/demo/redirect-flow-example/package.json b/demo/redirect-flow-example/package.json
index 6dc37cc1..16615cf9 100644
--- a/demo/redirect-flow-example/package.json
+++ b/demo/redirect-flow-example/package.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",
diff --git a/demo/redirect-flow-example/src/App.tsx b/demo/redirect-flow-example/src/App.tsx
index 38537668..d6890402 100644
--- a/demo/redirect-flow-example/src/App.tsx
+++ b/demo/redirect-flow-example/src/App.tsx
@@ -12,6 +12,7 @@ import {
   parseToken,
   factorKeyCurve,
   makeEthereumSigner,
+  SIG_TYPE,
 } from "@web3auth/mpc-core-kit";
 import { PasskeysPlugin } from "@web3auth/mpc-passkey-plugin";
 import Web3 from "web3";
@@ -19,13 +20,16 @@ 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) {
@@ -47,16 +51,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 passkeyPlugin = new PasskeysPlugin();
 
@@ -100,7 +94,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`);
@@ -113,45 +118,55 @@ 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 });
-        await passkeyPlugin.initWithMpcCoreKit(coreKitInstance as any);
-        if (window.location.hash.includes("#state")) {
-          await coreKitInstance.handleRedirectResult();
-        }
-      }
-      if (coreKitInstance.status === COREKIT_STATUS.LOGGED_IN) {
-        await setupProvider();
+  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();
+    }
 
-      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]"
-        );
-      }
+    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]"
+      );
+    }
 
-      console.log("coreKitInstance.status", coreKitInstance.status);
-      setCoreKitStatus(coreKitInstance.status);
+    console.log("newCoreKitInstance.status", newCoreKitInstance.status);
+    setCoreKitStatus(newCoreKitInstance.status);
 
-      try {
-        let result = securityQuestion.getQuestion(coreKitInstance!);
-        setQuestion(result);
-        uiConsole("security question set");
-      } catch (e) {
-        uiConsole("security question not set");
-      }
-    };
-    if (!initialized.current)
+    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) {
@@ -175,7 +190,7 @@ function App() {
     if (!factorPubs) {
       throw new Error("factorPubs not found");
     }
-    const pubsHex = factorPubs[coreKitInstance.tKey.tssTag].map((pub) => {
+    const pubsHex = factorPubs[coreKitInstance.tKey.tssTag].map(pub => {
       return pub.toSEC1(factorKeyCurve, true).toString("hex");
     });
     uiConsole(pubsHex);
@@ -361,8 +376,7 @@ 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);
@@ -370,19 +384,18 @@ function App() {
   };
 
   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"));
@@ -630,6 +643,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>
@@ -804,6 +843,7 @@ function App() {
 
   const unloggedInView = (
     <>
+      {tssLibSelector}
       <input value={mockEmail} onChange={(e) => setMockEmail(e.target.value)}></input>
       <button onClick={() => loginWithMock()} className="card">
         MockLogin
diff --git a/package-lock.json b/package-lock.json
index c24b5e80..12e78e82 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@web3auth/mpc-core-kit",
-  "version": "3.2.6",
+  "version": "4.0.0-alpha.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@web3auth/mpc-core-kit",
-      "version": "3.2.6",
+      "version": "4.0.0-alpha.0",
       "license": "ISC",
       "dependencies": {
         "@tkey/common-types": "^15.1.0",
@@ -14,17 +14,17 @@
         "@tkey/share-serialization": "^15.1.0",
         "@tkey/storage-layer-torus": "^15.1.0",
         "@tkey/tss": "^15.1.0",
-        "@toruslabs/constants": "^14.0.0",
+        "@toruslabs/constants": "^14.2.0",
         "@toruslabs/customauth": "^20.3.0",
-        "@toruslabs/elliptic-wrapper": "^0.1.0",
-        "@toruslabs/fetch-node-details": "^14.0.1",
-        "@toruslabs/fnd-base": "^14.0.0",
+        "@toruslabs/elliptic-wrapper": "^0.1.1",
+        "@toruslabs/fetch-node-details": "^14.2.0",
+        "@toruslabs/fnd-base": "^14.2.0",
         "@toruslabs/metadata-helpers": "^6.0.0",
         "@toruslabs/openlogin-utils": "^8.2.1",
         "@toruslabs/session-manager": "^3.1.0",
         "@toruslabs/torus.js": "15.2.0-alpha.0",
-        "@toruslabs/tss-client": "^3.1.0",
-        "@toruslabs/tss-frost-client": "0.3.1",
+        "@toruslabs/tss-client": "^3.3.0-alpha.0",
+        "@toruslabs/tss-frost-client": "^1.0.0-alpha.0",
         "@toruslabs/tss-frost-common": "^1.0.1",
         "bn.js": "^5.2.1",
         "bowser": "^2.11.0",
@@ -33,11 +33,12 @@
       },
       "devDependencies": {
         "@babel/register": "^7.25.7",
+        "@noble/curves": "^1.6.0",
         "@toruslabs/config": "^2.2.0",
         "@toruslabs/eslint-config-typescript": "^3.3.3",
         "@toruslabs/torus-scripts": "^6.1.2",
-        "@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",
         "@types/chai": "^4.3.16",
         "@types/elliptic": "^6.4.18",
         "@types/jsonwebtoken": "^9.0.7",
@@ -66,8 +67,9 @@
       },
       "peerDependencies": {
         "@babel/runtime": "^7.x",
-        "@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"
       },
       "peerDependenciesMeta": {
         "@toruslabs/tss-dkls-lib": {
@@ -75,6 +77,9 @@
         },
         "@toruslabs/tss-frost-lib": {
           "optional": true
+        },
+        "@toruslabs/tss-frost-lib-bip340": {
+          "optional": true
         }
       }
     },
@@ -2682,12 +2687,27 @@
       }
     },
     "node_modules/@noble/curves": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.4.2.tgz",
-      "integrity": "sha512-TavHr8qycMChk8UwMld0ZDRvatedkzWfH8IiaeGCfymOP5i0hSCozz9vHOL0nkwk7HRMlFnAiKpS2jrUmSybcw==",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.6.0.tgz",
+      "integrity": "sha512-TlaHRXDehJuRNR9TfZDNQ45mMEd5dwUwmicsafcIX4SsNiqnCHKjE/1alYPd/lDRVhxdhUAlv8uEhMCI5zjIJQ==",
       "license": "MIT",
       "dependencies": {
-        "@noble/hashes": "1.4.0"
+        "@noble/hashes": "1.5.0"
+      },
+      "engines": {
+        "node": "^14.21.3 || >=16"
+      },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
+      }
+    },
+    "node_modules/@noble/curves/node_modules/@noble/hashes": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.5.0.tgz",
+      "integrity": "sha512-1j6kQFb7QRru7eKN3ZDvRcP13rugwdxZqCjbiAVZfIJwgj2A65UmT4TgARXGlXgnRkORLTDTrO19ZErt7+QXgA==",
+      "license": "MIT",
+      "engines": {
+        "node": "^14.21.3 || >=16"
       },
       "funding": {
         "url": "https://paulmillr.com/funding/"
@@ -3332,6 +3352,18 @@
         "url": "https://paulmillr.com/funding/"
       }
     },
+    "node_modules/@scure/bip32/node_modules/@noble/curves": {
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.4.2.tgz",
+      "integrity": "sha512-TavHr8qycMChk8UwMld0ZDRvatedkzWfH8IiaeGCfymOP5i0hSCozz9vHOL0nkwk7HRMlFnAiKpS2jrUmSybcw==",
+      "license": "MIT",
+      "dependencies": {
+        "@noble/hashes": "1.4.0"
+      },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
+      }
+    },
     "node_modules/@scure/bip39": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/@scure/bip39/-/bip39-1.3.0.tgz",
@@ -4248,12 +4280,13 @@
       }
     },
     "node_modules/@toruslabs/tss-client": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/@toruslabs/tss-client/-/tss-client-3.2.0.tgz",
-      "integrity": "sha512-hDJdKOUFN7UhvojoDIiVT1rsLcGjU5SdTJFcJlrKpVZxmB+NuMWkjJvZK/SoYY6mFTnyod7/NYTCsyfrIOagvg==",
+      "version": "3.3.0-alpha.0",
+      "resolved": "https://registry.npmjs.org/@toruslabs/tss-client/-/tss-client-3.3.0-alpha.0.tgz",
+      "integrity": "sha512-osExXxucMAlQQnyYS9el870xeILPj1Cv7QFCy2Nk+NsJQ9DW9uK9F3/n9Do8mn5C8POOEyXSwrobxGdypN1MxQ==",
       "license": "ISC",
       "dependencies": {
         "@toruslabs/eccrypto": "^5.0.4",
+        "@toruslabs/tss-client-util": "^0.1.1",
         "bn.js": "^5.2.1",
         "elliptic": "^6.5.7",
         "ethereum-cryptography": "^3.0.0",
@@ -4269,21 +4302,6 @@
         "bn.js": "^5.2.1"
       }
     },
-    "node_modules/@toruslabs/tss-client/node_modules/@noble/curves": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.6.0.tgz",
-      "integrity": "sha512-TlaHRXDehJuRNR9TfZDNQ45mMEd5dwUwmicsafcIX4SsNiqnCHKjE/1alYPd/lDRVhxdhUAlv8uEhMCI5zjIJQ==",
-      "license": "MIT",
-      "dependencies": {
-        "@noble/hashes": "1.5.0"
-      },
-      "engines": {
-        "node": "^14.21.3 || >=16"
-      },
-      "funding": {
-        "url": "https://paulmillr.com/funding/"
-      }
-    },
     "node_modules/@toruslabs/tss-client/node_modules/@noble/hashes": {
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.5.0.tgz",
@@ -4341,15 +4359,15 @@
       }
     },
     "node_modules/@toruslabs/tss-dkls-lib": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/@toruslabs/tss-dkls-lib/-/tss-dkls-lib-4.1.0.tgz",
-      "integrity": "sha512-Iirs3uNigaYFSek/AqwSzsQovRzJaLVnmoGU5wC3/gpMTU9ZM4hLIconztRlSgfFmqcvxZWj+0JX1DnXyMmdXw==",
+      "version": "5.0.0-alpha.0",
+      "resolved": "https://registry.npmjs.org/@toruslabs/tss-dkls-lib/-/tss-dkls-lib-5.0.0-alpha.0.tgz",
+      "integrity": "sha512-htUWzL2JZoKTtw++WLdQ1AK3wPTe0yezv/twWjpQIzLFkkfoO9Urnl5n9S6jFx98Z1dDRJRBWSED9PSuqY/x7w==",
       "dev": true
     },
     "node_modules/@toruslabs/tss-frost-client": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/@toruslabs/tss-frost-client/-/tss-frost-client-0.3.1.tgz",
-      "integrity": "sha512-x19hWpbbAHVRWSUPt6FB4VH1vdQGiOe/aSJTts2HZtXRph/LzEGuT7FXyIOnglocYf58t5Z1nXqFEzn0rgQ49Q==",
+      "version": "1.0.0-alpha.0",
+      "resolved": "https://registry.npmjs.org/@toruslabs/tss-frost-client/-/tss-frost-client-1.0.0-alpha.0.tgz",
+      "integrity": "sha512-MvWl8Qt+/DIrNP+vqozYssXlWD1Ofo8jgRmUkiODuOew/wpePhIQv41XTcir7vdv2UU2SsG8N4L0FLU9O69Guw==",
       "license": "ISC",
       "dependencies": {
         "@toruslabs/tss-client-util": "^0.1.1",
@@ -4364,11 +4382,18 @@
       "license": "ISC"
     },
     "node_modules/@toruslabs/tss-frost-lib": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@toruslabs/tss-frost-lib/-/tss-frost-lib-1.0.0.tgz",
-      "integrity": "sha512-uDsM7f6NiVvNKVOfTUK+CucZUy1TjvTSYvk5LL8t2i/izWzNbBg4NO9qAFws3Kp9Kt1hG0xo8FkWzh3+oJ82xA==",
+      "version": "2.0.0-alpha.0",
+      "resolved": "https://registry.npmjs.org/@toruslabs/tss-frost-lib/-/tss-frost-lib-2.0.0-alpha.0.tgz",
+      "integrity": "sha512-oZy99HiES3OR8t6rrV6ccxwbrq38kxzz1C/5UIdqUVd2IRSWZzrcD+J4Q2/yR5bDMoK1HrucLShK96uMoXyv/A==",
       "dev": true
     },
+    "node_modules/@toruslabs/tss-frost-lib-bip340": {
+      "version": "0.1.0-alpha.0",
+      "resolved": "https://registry.npmjs.org/@toruslabs/tss-frost-lib-bip340/-/tss-frost-lib-bip340-0.1.0-alpha.0.tgz",
+      "integrity": "sha512-2dK/fhIfkxdbI/WPCRc1nJlL81nu70VMJyj313eJbO6oU13S92YjzoIhiCvBn6G/F3XpftD44wqNkr+S3QbAuA==",
+      "optional": true,
+      "peer": true
+    },
     "node_modules/@tsconfig/node10": {
       "version": "1.0.11",
       "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.11.tgz",
@@ -8188,6 +8213,18 @@
         "@scure/bip39": "1.3.0"
       }
     },
+    "node_modules/ethereum-cryptography/node_modules/@noble/curves": {
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.4.2.tgz",
+      "integrity": "sha512-TavHr8qycMChk8UwMld0ZDRvatedkzWfH8IiaeGCfymOP5i0hSCozz9vHOL0nkwk7HRMlFnAiKpS2jrUmSybcw==",
+      "license": "MIT",
+      "dependencies": {
+        "@noble/hashes": "1.4.0"
+      },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
+      }
+    },
     "node_modules/eventemitter3": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.1.tgz",
diff --git a/package.json b/package.json
index 5a91af6a..bc7fcac0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@web3auth/mpc-core-kit",
-  "version": "3.2.6",
+  "version": "4.0.0-alpha.0",
   "description": "MPC CoreKit SDK for web3Auth",
   "keywords": [
     "web3Auth/mpc-core-kit",
@@ -31,8 +31,9 @@
   ],
   "peerDependencies": {
     "@babel/runtime": "^7.x",
-    "@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"
   },
   "peerDependenciesMeta": {
     "@toruslabs/tss-dkls-lib": {
@@ -40,6 +41,9 @@
     },
     "@toruslabs/tss-frost-lib": {
       "optional": true
+    },
+    "@toruslabs/tss-frost-lib-bip340": {
+      "optional": true
     }
   },
   "dependencies": {
@@ -48,17 +52,17 @@
     "@tkey/share-serialization": "^15.1.0",
     "@tkey/storage-layer-torus": "^15.1.0",
     "@tkey/tss": "^15.1.0",
-    "@toruslabs/constants": "^14.0.0",
+    "@toruslabs/constants": "^14.2.0",
     "@toruslabs/customauth": "^20.3.0",
-    "@toruslabs/elliptic-wrapper": "^0.1.0",
-    "@toruslabs/fetch-node-details": "^14.0.1",
-    "@toruslabs/fnd-base": "^14.0.0",
+    "@toruslabs/elliptic-wrapper": "^0.1.1",
+    "@toruslabs/fetch-node-details": "^14.2.0",
+    "@toruslabs/fnd-base": "^14.2.0",
     "@toruslabs/metadata-helpers": "^6.0.0",
-    "@toruslabs/session-manager": "^3.1.0",
     "@toruslabs/openlogin-utils": "^8.2.1",
     "@toruslabs/torus.js": "15.2.0-alpha.0",
-    "@toruslabs/tss-client": "^3.1.0",
-    "@toruslabs/tss-frost-client": "0.3.1",
+    "@toruslabs/session-manager": "^3.1.0",
+    "@toruslabs/tss-client": "^3.3.0-alpha.0",
+    "@toruslabs/tss-frost-client": "^1.0.0-alpha.0",
     "@toruslabs/tss-frost-common": "^1.0.1",
     "bn.js": "^5.2.1",
     "bowser": "^2.11.0",
@@ -67,11 +71,12 @@
   },
   "devDependencies": {
     "@babel/register": "^7.25.7",
+    "@noble/curves": "^1.6.0",
     "@toruslabs/config": "^2.2.0",
     "@toruslabs/eslint-config-typescript": "^3.3.3",
     "@toruslabs/torus-scripts": "^6.1.2",
-    "@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",
     "@types/chai": "^4.3.16",
     "@types/elliptic": "^6.4.18",
     "@types/jsonwebtoken": "^9.0.7",
diff --git a/src/constants.ts b/src/constants.ts
index e29a4b9b..d927cfcd 100644
--- a/src/constants.ts
+++ b/src/constants.ts
@@ -1,4 +1,4 @@
-import { TORUS_SAPPHIRE_NETWORK } from "@toruslabs/constants";
+import { SIG_TYPE, TORUS_SAPPHIRE_NETWORK } from "@toruslabs/constants";
 
 export const WEB3AUTH_NETWORK = {
   MAINNET: TORUS_SAPPHIRE_NETWORK.SAPPHIRE_MAINNET,
@@ -51,3 +51,5 @@ export const FIELD_ELEMENT_HEX_LEN = 32 * 2; // Length of secp256k1 field elemen
 
 export const MAX_FACTORS = 10; // Maximum number of factors that can be added to an account.
 export const SOCIAL_TKEY_INDEX = 1;
+
+export { SIG_TYPE };
diff --git a/src/helper/errors.ts b/src/helper/errors.ts
index a622e75a..f22c3131 100644
--- a/src/helper/errors.ts
+++ b/src/helper/errors.ts
@@ -135,6 +135,8 @@ class CoreKitError extends AbstractCoreKitError {
     1005: "No valid storage option found.",
     1006: "No data found in storage.",
     1007: "Invalid config.",
+    1008: "Invalid key type.",
+    1009: "Invalid signature type.",
 
     // TSS and key management errors
     1101: "'tssLib' is required when running in this UX mode.",
@@ -215,6 +217,14 @@ class CoreKitError extends AbstractCoreKitError {
     return CoreKitError.fromCode(1007, extraMessage);
   }
 
+  public static invalidKeyType(extraMessage = ""): ICoreKitError {
+    return CoreKitError.fromCode(1008, extraMessage);
+  }
+
+  public static invalidSigType(extraMessage = ""): ICoreKitError {
+    return CoreKitError.fromCode(1009, extraMessage);
+  }
+
   // TSS and key management errors
   public static tssLibRequired(extraMessage = ""): ICoreKitError {
     return CoreKitError.fromCode(1101, extraMessage);
diff --git a/src/interfaces.ts b/src/interfaces.ts
index 782035e4..4cfcc5d6 100644
--- a/src/interfaces.ts
+++ b/src/interfaces.ts
@@ -1,5 +1,6 @@
 import { KeyType, Point as TkeyPoint, ShareDescriptionMap } from "@tkey/common-types";
 import { TKeyTSS } from "@tkey/tss";
+import { WEB3AUTH_SIG_TYPE } from "@toruslabs/constants";
 import type {
   AGGREGATE_VERIFIER_TYPE,
   ExtraParams,
@@ -12,17 +13,17 @@ import type {
 import { Client } from "@toruslabs/tss-client";
 // TODO: move the types to a base class for both dkls and frost in future
 import type { tssLib as TssDklsLib } from "@toruslabs/tss-dkls-lib";
-import type { tssLib as TssFrostLib } from "@toruslabs/tss-frost-lib";
+import type { tssLib as TssFrostLibEd25519 } from "@toruslabs/tss-frost-lib";
+import type { tssLib as TssFrostLibBip340 } from "@toruslabs/tss-frost-lib-bip340";
 import BN from "bn.js";
 
 import { FactorKeyTypeShareDescription, TssShareType, USER_PATH, WEB3AUTH_NETWORK } from "./constants";
 
 export type CoreKitMode = UX_MODE_TYPE | "nodejs" | "react-native";
 
-export type V3TSSLibType = { keyType: string; lib: unknown };
+export type V4TSSLibType = typeof TssDklsLib | typeof TssFrostLibEd25519 | typeof TssFrostLibBip340;
+export type TssLibType = typeof TssDklsLib | typeof TssFrostLibEd25519 | typeof TssFrostLibBip340;
 
-export type V4TSSLibType = typeof TssFrostLib | typeof TssDklsLib;
-export type TssLibType = V4TSSLibType | V3TSSLibType;
 export interface IStorage {
   getItem(key: string): string | null;
   setItem(key: string, value: string): void;
@@ -457,8 +458,11 @@ export interface TkeyLocalStoreData {
   factorKey: string;
 }
 
+export type SigType = WEB3AUTH_SIG_TYPE;
+
 export interface CoreKitSigner {
   keyType: KeyType;
+  sigType: SigType;
   sign(data: Buffer, hashed?: boolean): Promise<Buffer>;
   getPubKey(): Buffer;
 }
diff --git a/src/mpcCoreKit.ts b/src/mpcCoreKit.ts
index c9cc6a75..30ceff87 100644
--- a/src/mpcCoreKit.ts
+++ b/src/mpcCoreKit.ts
@@ -3,18 +3,19 @@ import { CoreError } from "@tkey/core";
 import { ShareSerializationModule } from "@tkey/share-serialization";
 import { TorusStorageLayer } from "@tkey/storage-layer-torus";
 import { factorKeyCurve, getPubKeyPoint, lagrangeInterpolation, TKeyTSS, TSSTorusServiceProvider } from "@tkey/tss";
-import { KEY_TYPE, SIGNER_MAP } from "@toruslabs/constants";
+import { SIGNER_MAP } from "@toruslabs/constants";
 import { AGGREGATE_VERIFIER, TORUS_METHOD, TorusAggregateLoginResponse, TorusLoginResponse, UX_MODE } from "@toruslabs/customauth";
 import type { UX_MODE_TYPE } from "@toruslabs/customauth/dist/types/utils/enums";
-import { Ed25519Curve } from "@toruslabs/elliptic-wrapper";
+import { Ed25519Curve, Secp256k1Curve } from "@toruslabs/elliptic-wrapper";
 import { fetchLocalConfig } from "@toruslabs/fnd-base";
 import { keccak256 } from "@toruslabs/metadata-helpers";
 import { SessionManager } from "@toruslabs/session-manager";
 import { Torus as TorusUtils, TorusKey } from "@toruslabs/torus.js";
 import { Client, getDKLSCoeff, setupSockets } from "@toruslabs/tss-client";
 import type { WasmLib as DKLSWasmLib } from "@toruslabs/tss-dkls-lib";
-import { sign as signEd25519 } from "@toruslabs/tss-frost-client";
-import type { WasmLib as FrostWasmLib } from "@toruslabs/tss-frost-lib";
+import { sign as signFrost } from "@toruslabs/tss-frost-client";
+import type { WasmLib as FrostWasmLibEd25519 } from "@toruslabs/tss-frost-lib";
+import type { WasmLib as FrostWasmLibBip340 } from "@toruslabs/tss-frost-lib-bip340";
 import BN from "bn.js";
 import bowser from "bowser";
 import { ec as EC } from "elliptic";
@@ -45,12 +46,11 @@ import {
   OAuthLoginParams,
   Secp256k1PrecomputedClient,
   SessionData,
+  SigType,
   SubVerifierDetailsParams,
   TkeyLocalStoreData,
   TssLibType,
   UserInfo,
-  V3TSSLibType,
-  V4TSSLibType,
   Web3AuthOptions,
   Web3AuthOptionsWithDefaults,
   Web3AuthState,
@@ -95,10 +95,12 @@ export class Web3AuthMPCCoreKit implements ICoreKit {
 
   private _tssLib: TssLibType;
 
-  private wasmLib: DKLSWasmLib | FrostWasmLib;
+  private wasmLib: DKLSWasmLib | FrostWasmLibEd25519 | FrostWasmLibBip340;
 
   private _keyType: KeyType;
 
+  private _sigType: SigType;
+
   private atomicCallStackCounter: number = 0;
 
   constructor(options: Web3AuthOptions) {
@@ -108,6 +110,7 @@ export class Web3AuthMPCCoreKit implements ICoreKit {
 
     this._tssLib = options.tssLib;
     this._keyType = options.tssLib.keyType as KeyType;
+    this._sigType = options.tssLib.sigType as SigType;
 
     const isNodejsOrRN = this.isNodejsOrRN(options.uxMode);
 
@@ -151,6 +154,10 @@ export class Web3AuthMPCCoreKit implements ICoreKit {
     return this._keyType;
   }
 
+  get sigType(): SigType {
+    return this._sigType;
+  }
+
   get signatures(): string[] {
     return this.state?.signatures ? this.state.signatures : [];
   }
@@ -181,7 +188,7 @@ export class Web3AuthMPCCoreKit implements ICoreKit {
   }
 
   get supportsAccountIndex(): boolean {
-    return this._keyType !== KeyType.ed25519;
+    return this._sigType !== "ed25519";
   }
 
   private get verifier(): string {
@@ -200,7 +207,7 @@ export class Web3AuthMPCCoreKit implements ICoreKit {
   }
 
   private get useClientGeneratedTSSKey(): boolean {
-    return this.keyType === KeyType.ed25519 && this.options.useClientGeneratedTSSKey === undefined ? true : !!this.options.useClientGeneratedTSSKey;
+    return this._sigType === "ed25519" && this.options.useClientGeneratedTSSKey === undefined ? true : !!this.options.useClientGeneratedTSSKey;
   }
 
   public setSessionSigGenerator(sessionSigGenerator: () => Promise<string[]>) {
@@ -243,8 +250,8 @@ export class Web3AuthMPCCoreKit implements ICoreKit {
 
     const nodeDetails = fetchLocalConfig(this.options.web3AuthNetwork, this.keyType);
 
-    if (this.keyType === KEY_TYPE.ED25519 && this.options.useDKG) {
-      throw CoreKitError.invalidConfig("DKG is not supported for ed25519 key type");
+    if (this._sigType === "ed25519" && this.options.useDKG) {
+      throw CoreKitError.invalidConfig("DKG is not supported for ed25519 signature type");
     }
 
     this.torusSp = new TSSTorusServiceProvider({
@@ -659,13 +666,31 @@ export class Web3AuthMPCCoreKit implements ICoreKit {
   /**
    * Get public key in ed25519 format.
    *
-   * Throws an error if keytype is not compatible with ed25519.
+   * Throws an error if signature type is not ed25519.
    */
   public getPubKeyEd25519(): Buffer {
+    if (this._sigType !== "ed25519") {
+      throw CoreKitError.default(`getPubKeyEd25519 not supported for signature type ${this.sigType}`);
+    }
+
     const p = this.tkey.tssCurve.keyFromPublic(this.getPubKey()).getPublic();
     return ed25519().keyFromPublic(p).getPublic();
   }
 
+  /**
+   * Get public key in bip340 format.
+   *
+   * Throws an error if signature type is not bip340.
+   */
+  public getPubKeyBip340(): Buffer {
+    if (this._sigType !== "bip340") {
+      throw CoreKitError.default(`getPubKeyBip340 not supported for signature type ${this.sigType}`);
+    }
+
+    const p = this.tkey.tssCurve.keyFromPublic(this.getPubKey()).getPublic();
+    return p.getX().toBuffer("be", 32);
+  }
+
   public async precompute_secp256k1(): Promise<{
     client: Client;
     serverCoeffs: Record<string, string>;
@@ -758,11 +783,11 @@ export class Web3AuthMPCCoreKit implements ICoreKit {
 
   public async sign(data: Buffer, hashed: boolean = false, secp256k1Precompute?: Secp256k1PrecomputedClient): Promise<Buffer> {
     this.wasmLib = await this.loadTssWasm();
-    if (this.keyType === KeyType.secp256k1) {
+    if (this._sigType === "ecdsa-secp256k1") {
       const sig = await this.sign_ECDSA_secp256k1(data, hashed, secp256k1Precompute);
       return Buffer.concat([sig.r, sig.s, Buffer.from([sig.v])]);
-    } else if (this.keyType === KeyType.ed25519) {
-      return this.sign_ed25519(data, hashed);
+    } else if (this._sigType === "ed25519" || this._sigType === "bip340") {
+      return this.sign_frost(data, hashed);
     }
     throw CoreKitError.default(`sign not supported for key type ${this.keyType}`);
   }
@@ -904,12 +929,9 @@ export class Web3AuthMPCCoreKit implements ICoreKit {
    *
    * Exports the private key scalar for the current account index.
    *
-   * For keytype ed25519, consider using _UNSAFE_exportTssEd25519Seed.
+   * For signature type ed25519, consider using _UNSAFE_exportTssEd25519Seed.
    */
   public async _UNSAFE_exportTssKey(): Promise<string> {
-    if (this.keyType !== KeyType.secp256k1) {
-      throw CoreKitError.default("Wrong KeyType. Method can only be used when KeyType is secp256k1");
-    }
     if (!this.state.factorKey) {
       throw CoreKitError.factorKeyNotPresent("factorKey not present in state when exporting tss key.");
     }
@@ -935,8 +957,8 @@ export class Web3AuthMPCCoreKit implements ICoreKit {
    * flow has been used.
    */
   public async _UNSAFE_exportTssEd25519Seed(): Promise<Buffer> {
-    if (this.keyType !== KeyType.ed25519) {
-      throw CoreKitError.default("Wrong KeyType. Method can only be used when KeyType is ed25519");
+    if (this._sigType !== "ed25519") {
+      throw CoreKitError.default("Wrong signature type. Method can only be used when signature type is ed25519.");
     }
     if (!this.state.factorKey) throw CoreKitError.factorKeyNotPresent("factorKey not present in state when exporting tss ed25519 seed.");
     if (!this.state.signatures) throw CoreKitError.signaturesNotPresent("Signatures not present in state when exporting tss ed25519 seed.");
@@ -1006,14 +1028,14 @@ export class Web3AuthMPCCoreKit implements ICoreKit {
     let importTssKey = providedImportTssKey;
     if (!existingUser) {
       if (!importTssKey && this.useClientGeneratedTSSKey) {
-        if (this.keyType === KeyType.ed25519) {
+        if (this._sigType === "ed25519") {
           const k = generateEd25519Seed();
           importTssKey = k.toString("hex");
         } else if (this.keyType === KeyType.secp256k1) {
           const k = secp256k1.genKeyPair().getPrivate();
           importTssKey = scalarBNToBufferSEC1(k).toString("hex");
         } else {
-          throw CoreKitError.default("Unsupported key type");
+          throw CoreKitError.default(`Unsupported key type and sig type combination: ${this.keyType}, ${this._sigType}`);
         }
       }
       await this.handleNewUser(importTssKey);
@@ -1398,28 +1420,35 @@ export class Web3AuthMPCCoreKit implements ICoreKit {
     }
   }
 
-  private async sign_ed25519(data: Buffer, hashed: boolean = false): Promise<Buffer> {
+  private async sign_frost(data: Buffer, hashed: boolean = false): Promise<Buffer> {
     if (hashed) {
-      throw CoreKitError.default("hashed data not supported for ed25519");
+      throw CoreKitError.default(`hashed data not supported for ${this._sigType}`);
     }
 
-    const nodeDetails = fetchLocalConfig(this.options.web3AuthNetwork, "ed25519");
+    const nodeDetails = fetchLocalConfig(this.options.web3AuthNetwork, this.keyType, this._sigType);
     if (!nodeDetails.torusNodeTSSEndpoints) {
       throw CoreKitError.default("could not fetch tss node endpoints");
     }
 
     // Endpoints must end with backslash, but URLs returned by
     // `fetch-node-details` don't have it.
-    const ED25519_ENDPOINTS = nodeDetails.torusNodeTSSEndpoints.map((ep, i) => ({ index: nodeDetails.torusIndexes[i], url: `${ep}/` }));
+    const serverEndpoints = nodeDetails.torusNodeTSSEndpoints.map((ep, i) => ({ index: nodeDetails.torusIndexes[i], url: `${ep}/` }));
 
     // Select endpoints and derive party indices.
-    const serverThreshold = Math.floor(ED25519_ENDPOINTS.length / 2) + 1;
-    const endpoints = sampleEndpoints(ED25519_ENDPOINTS, serverThreshold);
+    const serverThreshold = Math.floor(serverEndpoints.length / 2) + 1;
+    const endpoints = sampleEndpoints(serverEndpoints, serverThreshold);
     const serverXCoords = endpoints.map((x) => x.index);
     const clientXCoord = Math.max(...endpoints.map((ep) => ep.index)) + 1;
 
     // Derive share coefficients for flat hierarchy.
-    const ec = new Ed25519Curve();
+    const ec = (() => {
+      if (this.keyType === KeyType.secp256k1) {
+        return new Secp256k1Curve();
+      } else if (this.keyType === KeyType.ed25519) {
+        return new Ed25519Curve();
+      }
+      throw CoreKitError.default(`key type ${this.keyType} not supported with FROST signing`);
+    })();
     const { serverCoefficients, clientCoefficient } = deriveShareCoefficients(ec, serverXCoords, clientXCoord, this.state.tssShareIndex);
 
     // Get pub key.
@@ -1427,7 +1456,7 @@ export class Web3AuthMPCCoreKit implements ICoreKit {
     const tssPubKeyPoint = ec.keyFromPublic(tssPubKey).getPublic();
 
     // Get client key share and adjust by coefficient.
-    if (this.state.accountIndex !== 0) {
+    if (this._sigType === "ed25519" && this.state.accountIndex !== 0) {
       throw CoreKitError.default("Account index not supported for ed25519");
     }
     const { tssShare } = await this.tKey.getTSSShare(this.state.factorKey);
@@ -1444,9 +1473,8 @@ export class Web3AuthMPCCoreKit implements ICoreKit {
     const pubKeyHex = ec.pointToBuffer(tssPubKeyPoint, Buffer).toString("hex");
     const serverCoefficientsHex = serverCoefficients.map((c) => ec.scalarToBuffer(c, Buffer).toString("hex"));
     const authSignatures = await this.fetchSessionSignatures();
-
-    const signature = await signEd25519(
-      this.wasmLib as FrostWasmLib,
+    const signature = await signFrost(
+      this.wasmLib as FrostWasmLibEd25519 | FrostWasmLibBip340,
       session,
       authSignatures,
       serverXCoords,
@@ -1464,11 +1492,6 @@ export class Web3AuthMPCCoreKit implements ICoreKit {
 
   private async loadTssWasm() {
     if (this.wasmLib) return this.wasmLib;
-    if (typeof (this._tssLib as V4TSSLibType).load === "function") {
-      // dont wait for wasm to be loaded, we can reload it during signing if not loaded
-      return (this._tssLib as V4TSSLibType).load();
-    } else if ((this._tssLib as V3TSSLibType).lib) {
-      return (this._tssLib as V3TSSLibType).lib as DKLSWasmLib | FrostWasmLib;
-    }
+    return this._tssLib.load();
   }
 }
diff --git a/tests/bip340.spec.ts b/tests/bip340.spec.ts
new file mode 100644
index 00000000..298d1009
--- /dev/null
+++ b/tests/bip340.spec.ts
@@ -0,0 +1,153 @@
+import assert from "node:assert";
+import test from "node:test";
+
+import { EllipticPoint } from "@tkey/common-types";
+import { UX_MODE_TYPE } from "@toruslabs/customauth";
+import { tssLib } from "@toruslabs/tss-frost-lib-bip340";
+import BN from "bn.js";
+import { schnorr as bip340 } from '@noble/curves/secp256k1';
+
+import { AsyncStorage, COREKIT_STATUS, MemoryStorage, WEB3AUTH_NETWORK, WEB3AUTH_NETWORK_TYPE, Web3AuthMPCCoreKit } from "../src";
+import { bufferToElliptic, criticalResetAccount, mockLogin, mockLogin2 } from "./setup";
+
+type TestVariable = {
+  web3AuthNetwork: WEB3AUTH_NETWORK_TYPE;
+  uxMode: UX_MODE_TYPE | "nodejs";
+  manualSync?: boolean;
+  email: string;
+};
+
+const defaultTestEmail = "testEmailForLoginBip340";
+const variable: TestVariable[] = [
+  { web3AuthNetwork: WEB3AUTH_NETWORK.DEVNET, uxMode: "nodejs", email: defaultTestEmail },
+  // { web3AuthNetwork: WEB3AUTH_NETWORK.MAINNET, uxMode: UX_MODE.REDIRECT, email: defaultTestEmail },
+
+  { web3AuthNetwork: WEB3AUTH_NETWORK.DEVNET, uxMode: "nodejs", manualSync: true, email: defaultTestEmail },
+  // { web3AuthNetwork: WEB3AUTH_NETWORK.MAINNET, uxMode: UX_MODE.REDIRECT, manualSync: true, email: defaultTestEmail },
+];
+
+const checkLogin = async (coreKitInstance: Web3AuthMPCCoreKit, accountIndex = 0) => {
+  const keyDetails = coreKitInstance.getKeyDetails();
+  assert.strictEqual(coreKitInstance.status, COREKIT_STATUS.LOGGED_IN);
+  assert.strictEqual(keyDetails.requiredFactors, 0);
+  const factorkey = coreKitInstance.getCurrentFactorKey();
+  await coreKitInstance.tKey.getTSSShare(new BN(factorkey.factorKey, "hex"), {
+    accountIndex,
+  });
+};
+
+const storageInstance = new MemoryStorage();
+
+variable.forEach((testVariable) => {
+  const { web3AuthNetwork, uxMode, manualSync, email } = testVariable;
+  const newCoreKitInstance = () =>
+    new Web3AuthMPCCoreKit({
+      web3AuthClientId: "torus-key-test",
+      web3AuthNetwork,
+      baseUrl: "http://localhost:3000",
+      uxMode,
+      tssLib,
+      storage: storageInstance,
+      manualSync,
+    });
+
+  async function resetAccount() {
+    const resetInstance = newCoreKitInstance();
+    const { idToken, parsedToken } = await mockLogin(email);
+    await resetInstance.init({ handleRedirectResult: false, rehydrate: false });
+    await resetInstance.loginWithJWT({
+      verifier: "torus-test-health",
+      verifierId: parsedToken.email,
+      idToken,
+    });
+    await criticalResetAccount(resetInstance);
+    await new AsyncStorage(resetInstance._storageKey, storageInstance).resetStore();
+  }
+
+  const testNameSuffix = JSON.stringify(testVariable);
+
+  let checkPubKey: EllipticPoint;
+  let checkTssShare: BN;
+
+  test(`#Login Test with JWT + logout:  ${testNameSuffix}`, async (t) => {
+    await resetAccount();
+    await t.test("#Login", async function () {
+      const coreKitInstance = newCoreKitInstance();
+
+      // mocklogin
+      const { idToken, parsedToken } = await mockLogin(email);
+      await coreKitInstance.init({ handleRedirectResult: false });
+      await coreKitInstance.loginWithJWT({
+        verifier: "torus-test-health",
+        verifierId: parsedToken.email,
+        idToken,
+      });
+      // get key details
+      await checkLogin(coreKitInstance);
+
+      checkPubKey = bufferToElliptic(coreKitInstance.getPubKey(), coreKitInstance.tKey.tssCurve);
+      const factorkey = coreKitInstance.getCurrentFactorKey();
+      const { tssShare } = await coreKitInstance.tKey.getTSSShare(new BN(factorkey.factorKey, "hex"), {
+        threshold: 0,
+      });
+      checkTssShare = tssShare;
+
+      if (manualSync) {
+        await coreKitInstance.commitChanges();
+      }
+      // check whether the public key and tss share is same as old sdks
+    });
+
+    await t.test("#relogin ", async function () {
+      const coreKitInstance = newCoreKitInstance();
+      // rehydrate
+      await coreKitInstance.init({ handleRedirectResult: false });
+      await checkLogin(coreKitInstance);
+
+      // logout
+      await coreKitInstance.logout();
+
+      // rehydrate should fail
+      await coreKitInstance.init({
+        rehydrate: false,
+        handleRedirectResult: false,
+      });
+      assert.strictEqual(coreKitInstance.status, COREKIT_STATUS.INITIALIZED);
+      assert.throws(() => coreKitInstance.getCurrentFactorKey());
+
+      // relogin
+      const { idToken, parsedToken } = await mockLogin(email);
+      await coreKitInstance.loginWithJWT({
+        verifier: "torus-test-health",
+        verifierId: parsedToken.email,
+        idToken,
+      });
+
+      // get key details
+      await checkLogin(coreKitInstance);
+      const newPubKey = bufferToElliptic(coreKitInstance.getPubKey(), coreKitInstance.tKey.tssCurve);
+      const factorkey = coreKitInstance.getCurrentFactorKey();
+      const { tssShare: newTssShare } = await coreKitInstance.tKey.getTSSShare(new BN(factorkey.factorKey, "hex"));
+      assert(checkPubKey.eq(newPubKey));
+      assert(checkTssShare.eq(newTssShare));
+    });
+
+    await t.test("#able to sign", async function () {
+      const coreKitInstance = newCoreKitInstance();
+      await coreKitInstance.init({ handleRedirectResult: false, rehydrate: false });
+      const localToken = await mockLogin2(email);
+      await coreKitInstance.loginWithJWT({
+        verifier: "torus-test-health",
+        verifierId: email,
+        idToken: localToken.idToken,
+      });
+      const msg = "hello world";
+      const msgBuffer = Buffer.from(msg);
+
+      const signature = await coreKitInstance.sign(msgBuffer);
+      const pk = coreKitInstance.getPubKeyBip340();
+      const valid = bip340.verify(signature, msgBuffer, pk);
+      assert(valid);
+    });
+  });
+});
diff --git a/tests/importRecovery.spec.ts b/tests/importRecovery.spec.ts
index d7bb18b3..8d3bbc8e 100644
--- a/tests/importRecovery.spec.ts
+++ b/tests/importRecovery.spec.ts
@@ -4,14 +4,14 @@ import test from "node:test";
 import { tssLib as tssLibDKLS } from "@toruslabs/tss-dkls-lib";
 import { tssLib as tssLibFROST } from "@toruslabs/tss-frost-lib";
 
-import { AsyncStorage, MemoryStorage, TssLib, TssShareType, WEB3AUTH_NETWORK } from "../src";
+import { AsyncStorage, MemoryStorage, TssLibType, TssShareType, WEB3AUTH_NETWORK } from "../src";
 import { bufferToElliptic, criticalResetAccount, newCoreKitLogInInstance } from "./setup";
 
 type ImportKeyTestVariable = {
   manualSync?: boolean;
   email: string;
   importKeyEmail: string;
-  tssLib: TssLib;
+  tssLib: TssLibType;
 };
 
 const storageInstance = new MemoryStorage();
diff --git a/tests/setup.ts b/tests/setup.ts
index ed768178..596ca177 100644
--- a/tests/setup.ts
+++ b/tests/setup.ts
@@ -4,7 +4,7 @@ import BN from "bn.js";
 import jwt, { Algorithm } from "jsonwebtoken";
 import { tssLib as tssLibDKLS } from "@toruslabs/tss-dkls-lib";
 
-import { IAsyncStorage, IStorage, parseToken, TssLib, WEB3AUTH_NETWORK_TYPE, Web3AuthMPCCoreKit } from "../src";
+import { IAsyncStorage, IStorage, parseToken, TssLibType, WEB3AUTH_NETWORK_TYPE, Web3AuthMPCCoreKit } from "../src";
 
 export const mockLogin2 = async (email: string) => {
   const req = new Request("https://li6lnimoyrwgn2iuqtgdwlrwvq0upwtr.lambda-url.eu-west-1.on.aws/", {
@@ -97,7 +97,7 @@ export const newCoreKitLogInInstance = async ({
   manualSync: boolean;
   email: string;
   storageInstance: IStorage | IAsyncStorage;
-  tssLib?: TssLib;
+  tssLib?: TssLibType;
   importTssKey?: string;
   login?: LoginFunc;
 }) => {