Merge pull request #12 from mybucks-online/feat/update-dependency

upgrade @mybucks.online/core

Author: koko37

package.json

@@ -30,15 +30,14 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@mybucks.online/core": "^1.0.2",
+    "@mybucks.online/core": "^1.0.3",
     "@sushiswap/default-token-list": "^43.3.0",
     "alchemy-sdk": "^3.5.0",
     "buffer": "^6.0.3",
     "clipboard-copy": "^4.0.1",
     "date-fns": "^4.1.0",
     "ethers": "^6.13.0",
     "focus-trap-react": "^10.2.3",
-    "nanoid": "^5.0.9",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-idle-timer": "^5.7.2",

src/lib/conf.js

@@ -1,6 +1,4 @@
 import { Network } from "alchemy-sdk";
-import { Buffer } from "buffer";
-import { nanoid } from "nanoid";
 
 export const PASSWORD_MIN_LENGTH = 12;
 export const PASSWORD_MAX_LENGTH = 128;
@@ -9,25 +7,6 @@ export const PASSCODE_MAX_LENGTH = 16;
 
 export const PASSCODE_MAX_TRY = 3;
 
-const URL_DELIMITER = "\u0002";
-
-export function generateUrl(password, passcode, network) {
-  const merged = Buffer.from(
-    password + URL_DELIMITER + passcode + URL_DELIMITER + network,
-    "utf-8"
-  );
-  const base64Encoded = merged.toString("base64");
-  const padding = nanoid(12);
-  return padding.slice(0, 6) + base64Encoded + padding.slice(6);
-}
-
-export function parseUrl(token) {
-  const payload = token.slice(6, token.length - 6);
-  const base64Decoded = Buffer.from(payload, "base64").toString("utf-8");
-  const [password, passcode, network] = base64Decoded.split(URL_DELIMITER);
-  return [password, passcode, network];
-}
-
 export const NETWORK = Object.freeze({
   EVM: "evm",
   TRON: "tron",

src/pages/Menu/index.jsx

@@ -1,5 +1,6 @@
 import { useContext, useState } from "react";
 import { toast } from "react-toastify";
+import { generateToken } from "@mybucks.online/core";
 import copy from "clipboard-copy";
 import styled from "styled-components";
 
@@ -9,7 +10,7 @@ import ConfirmPasscodeModal from "@mybucks/components/ConfirmPasscodeModal";
 import { Box as BaseBox, Container } from "@mybucks/components/Containers";
 import { H3 } from "@mybucks/components/Texts";
 import { StoreContext } from "@mybucks/contexts/Store";
-import { findNetworkNameByChainId, generateUrl } from "@mybucks/lib/conf";
+import { findNetworkNameByChainId } from "@mybucks/lib/conf";
 
 const Box = styled(BaseBox)`
   display: flex;
@@ -82,7 +83,7 @@ const Menu = () => {
       toast("Private key copied into clipboard.");
     } else if (nextStep === BACKUP_TRANSFER_LINK) {
       const networkName = findNetworkNameByChainId(network, chainId);
-      const link = generateUrl(password, passcode, networkName);
+      const link = generateToken(password, passcode, networkName);
       copy(
         window.location.origin + window.location.pathname + "?wallet=" + link
       );

src/pages/Signin/index.jsx

@@ -1,5 +1,5 @@
 import { useContext, useEffect, useMemo, useState } from "react";
-import { generateHash } from "@mybucks.online/core";
+import { generateHash, parseToken } from "@mybucks.online/core";
 import styled from "styled-components";
 
 import Button from "@mybucks/components/Button";
@@ -13,7 +13,6 @@ import { H1 } from "@mybucks/components/Texts";
 import { StoreContext } from "@mybucks/contexts/Store";
 import {
   findNetworkByName,
-  parseUrl,
   PASSCODE_MAX_LENGTH,
   PASSCODE_MIN_LENGTH,
   PASSWORD_MAX_LENGTH,
@@ -188,7 +187,7 @@ const SignIn = () => {
   );
 
   useEffect(() => {
-    const parseUrlAndSubmit = async () => {
+    const parseTokenAndSubmit = async () => {
       // get "secret" param from URL
       const url = new URL(window.location.href);
       const params = new URLSearchParams(url.search);
@@ -198,7 +197,7 @@ const SignIn = () => {
       }
 
       // parse password, passcode, network name from "secret" param
-      const [pwd, pc, nn] = parseUrl(secret);
+      const [pwd, pc, nn] = parseToken(secret);
       if (!pwd || !pc || !nn) {
         return;
       }
@@ -213,7 +212,7 @@ const SignIn = () => {
       setDisabled(false);
     };
 
-    parseUrlAndSubmit();
+    parseTokenAndSubmit();
   }, []);
 
   const onSubmit = async () => {

yarn.lock

@@ -769,13 +769,14 @@
     "@jridgewell/resolve-uri" "^3.1.0"
     "@jridgewell/sourcemap-codec" "^1.4.14"
 
-"@mybucks.online/core@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@mybucks.online/core/-/core-1.0.2.tgz#6a671b68e7c9c20e6ff04fd4d2351ccd38aa3af1"
-  integrity sha512-Ptbn9L8A6yFU5+NlK1plqu5/Y6RgLyZB6VPsHVjExJjHLiMUiGWX8/8Lmdhfsx/lTmLECtZl65zmG91rkbjYYA==
+"@mybucks.online/core@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@mybucks.online/core/-/core-1.0.3.tgz#1fd4e0bf37584afc3dc8c319e175741f5dba5f32"
+  integrity sha512-zBXVUbiGAGgkDK90KjF1sJisuLWuEhGRO9sBVAPGjpZqtrPlVYDjX/ieWJmQ6alWdX3UYG4y7lsSITVura85RA==
   dependencies:
     buffer "^6.0.3"
     ethers "^6.13.5"
+    nanoid "^5.0.9"
     scrypt-js "^3.0.1"
 
 "@noble/curves@1.2.0":