Skip to content

Commit

Permalink
merge with v4
Browse files Browse the repository at this point in the history
  • Loading branch information
@himanshuchawla009
himanshuchawla009 committed Dec 2, 2024
2 parents 27d7ae3 + aa4cade commit 09327bd
Show file tree
Hide file tree
Showing 12 changed files with 463 additions and 177 deletions.
51 changes: 31 additions & 20 deletions demo/redirect-flow-example/package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions demo/redirect-flow-example/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
142 changes: 91 additions & 51 deletions demo/redirect-flow-example/src/App.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,24 @@ import {
parseToken,
factorKeyCurve,
makeEthereumSigner,
SIG_TYPE,
} from "@web3auth/mpc-core-kit";
import { PasskeysPlugin } from "@web3auth/mpc-passkey-plugin";
import Web3 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) {
Expand All @@ -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();

Expand Down Expand Up @@ -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`);
Expand All @@ -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) {
Expand All @@ -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);
Expand Down Expand Up @@ -361,28 +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"));
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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
Expand Down
Loading

0 comments on commit 09327bd

Please sign in to comment.