refactor: unify add-wallet, import-key, and import-xprv into single view
All checks were successful
check / check (push) Successful in 22s
All checks were successful
check / check (push) Successful in 22s
Merge all three wallet import methods (recovery phrase, private key, extended key/xprv) into one tabbed add-wallet view with a mode selector. This fixes the blank import-xprv render (it was missing from the VIEWS array) and the broken back-button navigation from the separate import views. - Add tab selector: Recovery Phrase | Private Key | Extended Key (xprv) - Share password fields across all modes - Remove separate import-key and import-xprv views and modules - Add duplicate wallet detection for private key imports - All tabs follow affordance policy (visible border + hover state) Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -56,37 +56,101 @@
|
|||||||
< Back
|
< Back
|
||||||
</button>
|
</button>
|
||||||
<h2 class="font-bold mb-2">Add Wallet</h2>
|
<h2 class="font-bold mb-2">Add Wallet</h2>
|
||||||
<p class="mb-2">
|
|
||||||
Enter your 12 or 24 word recovery phrase below, or click the
|
<!-- Mode selector tabs -->
|
||||||
button to roll the die for a new one.
|
<div class="flex gap-1 mb-3">
|
||||||
</p>
|
|
||||||
<div class="mb-1 flex justify-end">
|
|
||||||
<button
|
<button
|
||||||
id="btn-generate-phrase"
|
id="tab-mnemonic"
|
||||||
class="border border-border px-2 py-1 hover:bg-fg hover:text-bg cursor-pointer text-xs"
|
class="border border-border px-2 py-1 cursor-pointer text-xs hover:bg-fg hover:text-bg bg-fg text-bg"
|
||||||
title="Generate a random recovery phrase"
|
|
||||||
>
|
>
|
||||||
[⚀]
|
Recovery Phrase
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
id="tab-privkey"
|
||||||
|
class="border border-border px-2 py-1 cursor-pointer text-xs hover:bg-fg hover:text-bg"
|
||||||
|
>
|
||||||
|
Private Key
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
id="tab-xprv"
|
||||||
|
class="border border-border px-2 py-1 cursor-pointer text-xs hover:bg-fg hover:text-bg"
|
||||||
|
>
|
||||||
|
Extended Key (xprv)
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
<div class="mb-2">
|
|
||||||
<textarea
|
<!-- Mnemonic form section -->
|
||||||
id="wallet-mnemonic"
|
<div id="add-wallet-section-mnemonic">
|
||||||
rows="3"
|
<p class="mb-2">
|
||||||
class="border border-border p-1 w-full font-mono text-sm bg-bg text-fg resize-y"
|
Enter your 12 or 24 word recovery phrase below, or click
|
||||||
placeholder="word word word ..."
|
the button to roll the die for a new one.
|
||||||
></textarea>
|
</p>
|
||||||
|
<div class="mb-1 flex justify-end">
|
||||||
|
<button
|
||||||
|
id="btn-generate-phrase"
|
||||||
|
class="border border-border px-2 py-1 hover:bg-fg hover:text-bg cursor-pointer text-xs"
|
||||||
|
title="Generate a random recovery phrase"
|
||||||
|
>
|
||||||
|
[⚀]
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
<div class="mb-2">
|
||||||
|
<textarea
|
||||||
|
id="wallet-mnemonic"
|
||||||
|
rows="3"
|
||||||
|
class="border border-border p-1 w-full font-mono text-sm bg-bg text-fg resize-y"
|
||||||
|
placeholder="word word word ..."
|
||||||
|
></textarea>
|
||||||
|
</div>
|
||||||
|
<div
|
||||||
|
id="add-wallet-phrase-warning"
|
||||||
|
class="text-xs mb-2 border border-border border-dashed p-2 hidden"
|
||||||
|
>
|
||||||
|
Write these words down and keep them safe. Anyone with
|
||||||
|
them can take your funds; if you lose them, your wallet
|
||||||
|
is gone.
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div
|
|
||||||
id="add-wallet-phrase-warning"
|
<!-- Private key form section -->
|
||||||
class="text-xs mb-2 border border-border border-dashed p-2 hidden"
|
<div id="add-wallet-section-privkey" class="hidden">
|
||||||
>
|
<p class="mb-2">
|
||||||
Write these words down and keep them safe. Anyone with them
|
Paste your private key below. This wallet will have a
|
||||||
can take your funds; if you lose them, your wallet is gone.
|
single address.
|
||||||
|
</p>
|
||||||
|
<div class="mb-2">
|
||||||
|
<input
|
||||||
|
type="password"
|
||||||
|
id="import-private-key"
|
||||||
|
class="border border-border p-1 w-full font-mono text-sm bg-bg text-fg"
|
||||||
|
placeholder="0x..."
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<!-- Extended key (xprv) form section -->
|
||||||
|
<div id="add-wallet-section-xprv" class="hidden">
|
||||||
|
<p class="mb-2">
|
||||||
|
Paste your extended private key (xprv) below. This will
|
||||||
|
import the HD wallet and scan for used addresses.
|
||||||
|
</p>
|
||||||
|
<div class="mb-2">
|
||||||
|
<input
|
||||||
|
type="password"
|
||||||
|
id="import-xprv-key"
|
||||||
|
class="border border-border p-1 w-full font-mono text-sm bg-bg text-fg"
|
||||||
|
placeholder="xprv..."
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Shared password fields -->
|
||||||
<div class="mb-2" id="add-wallet-password-section">
|
<div class="mb-2" id="add-wallet-password-section">
|
||||||
<label class="block mb-1">Choose a password</label>
|
<label class="block mb-1">Choose a password</label>
|
||||||
<p class="text-xs text-muted mb-1">
|
<p
|
||||||
|
class="text-xs text-muted mb-1"
|
||||||
|
id="add-wallet-password-hint"
|
||||||
|
>
|
||||||
This password encrypts your recovery phrase on this
|
This password encrypts your recovery phrase on this
|
||||||
device. You will need it to send funds.
|
device. You will need it to send funds.
|
||||||
</p>
|
</p>
|
||||||
@@ -107,122 +171,6 @@
|
|||||||
<button
|
<button
|
||||||
id="btn-add-wallet-confirm"
|
id="btn-add-wallet-confirm"
|
||||||
class="border border-border px-2 py-1 hover:bg-fg hover:text-bg cursor-pointer"
|
class="border border-border px-2 py-1 hover:bg-fg hover:text-bg cursor-pointer"
|
||||||
>
|
|
||||||
Add
|
|
||||||
</button>
|
|
||||||
<div class="mt-3 text-xs text-muted">
|
|
||||||
Have a private key instead?
|
|
||||||
<button
|
|
||||||
id="btn-add-wallet-import-key"
|
|
||||||
class="underline cursor-pointer bg-transparent border-none text-fg text-xs font-mono p-0"
|
|
||||||
>
|
|
||||||
Import private key
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
<div class="mt-1 text-xs text-muted">
|
|
||||||
Have an extended private key (xprv)?
|
|
||||||
<button
|
|
||||||
id="btn-add-wallet-import-xprv"
|
|
||||||
class="underline cursor-pointer bg-transparent border-none text-fg text-xs font-mono p-0"
|
|
||||||
>
|
|
||||||
Import xprv
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- ============ IMPORT PRIVATE KEY ============ -->
|
|
||||||
<div id="view-import-key" class="view hidden">
|
|
||||||
<button
|
|
||||||
id="btn-import-key-back"
|
|
||||||
class="border border-border px-2 py-1 hover:bg-fg hover:text-bg cursor-pointer mb-2"
|
|
||||||
>
|
|
||||||
< Back
|
|
||||||
</button>
|
|
||||||
<h2 class="font-bold mb-2">Import Private Key</h2>
|
|
||||||
<p class="mb-2">
|
|
||||||
Paste your private key below. This wallet will have a single
|
|
||||||
address.
|
|
||||||
</p>
|
|
||||||
<div class="mb-2">
|
|
||||||
<input
|
|
||||||
type="password"
|
|
||||||
id="import-private-key"
|
|
||||||
class="border border-border p-1 w-full font-mono text-sm bg-bg text-fg"
|
|
||||||
placeholder="0x..."
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
<div class="mb-2" id="import-key-password-section">
|
|
||||||
<label class="block mb-1">Choose a password</label>
|
|
||||||
<p class="text-xs text-muted mb-1">
|
|
||||||
This password encrypts your private key on this device.
|
|
||||||
You will need it to send funds.
|
|
||||||
</p>
|
|
||||||
<input
|
|
||||||
type="password"
|
|
||||||
id="import-key-password"
|
|
||||||
class="border border-border p-1 w-full font-mono text-sm bg-bg text-fg"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
<div class="mb-2" id="import-key-password-confirm-section">
|
|
||||||
<label class="block mb-1">Confirm password</label>
|
|
||||||
<input
|
|
||||||
type="password"
|
|
||||||
id="import-key-password-confirm"
|
|
||||||
class="border border-border p-1 w-full font-mono text-sm bg-bg text-fg"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
<button
|
|
||||||
id="btn-import-key-confirm"
|
|
||||||
class="border border-border px-2 py-1 hover:bg-fg hover:text-bg cursor-pointer"
|
|
||||||
>
|
|
||||||
Import
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- ============ IMPORT XPRV ============ -->
|
|
||||||
<div id="view-import-xprv" class="view hidden">
|
|
||||||
<button
|
|
||||||
id="btn-import-xprv-back"
|
|
||||||
class="border border-border px-2 py-1 hover:bg-fg hover:text-bg cursor-pointer mb-2"
|
|
||||||
>
|
|
||||||
< Back
|
|
||||||
</button>
|
|
||||||
<h2 class="font-bold mb-2">Import Extended Private Key</h2>
|
|
||||||
<p class="mb-2">
|
|
||||||
Paste your extended private key (xprv) below. This will
|
|
||||||
import the HD wallet and scan for used addresses.
|
|
||||||
</p>
|
|
||||||
<div class="mb-2">
|
|
||||||
<input
|
|
||||||
type="password"
|
|
||||||
id="import-xprv-key"
|
|
||||||
class="border border-border p-1 w-full font-mono text-sm bg-bg text-fg"
|
|
||||||
placeholder="xprv..."
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
<div class="mb-2" id="import-xprv-password-section">
|
|
||||||
<label class="block mb-1">Choose a password</label>
|
|
||||||
<p class="text-xs text-muted mb-1">
|
|
||||||
This password encrypts your key on this device. You will
|
|
||||||
need it to send funds.
|
|
||||||
</p>
|
|
||||||
<input
|
|
||||||
type="password"
|
|
||||||
id="import-xprv-password"
|
|
||||||
class="border border-border p-1 w-full font-mono text-sm bg-bg text-fg"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
<div class="mb-2" id="import-xprv-password-confirm-section">
|
|
||||||
<label class="block mb-1">Confirm password</label>
|
|
||||||
<input
|
|
||||||
type="password"
|
|
||||||
id="import-xprv-password-confirm"
|
|
||||||
class="border border-border p-1 w-full font-mono text-sm bg-bg text-fg"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
<button
|
|
||||||
id="btn-import-xprv-confirm"
|
|
||||||
class="border border-border px-2 py-1 hover:bg-fg hover:text-bg cursor-pointer"
|
|
||||||
>
|
>
|
||||||
Import
|
Import
|
||||||
</button>
|
</button>
|
||||||
|
|||||||
@@ -10,8 +10,6 @@ const { $, showView } = require("./views/helpers");
|
|||||||
const home = require("./views/home");
|
const home = require("./views/home");
|
||||||
const welcome = require("./views/welcome");
|
const welcome = require("./views/welcome");
|
||||||
const addWallet = require("./views/addWallet");
|
const addWallet = require("./views/addWallet");
|
||||||
const importKey = require("./views/importKey");
|
|
||||||
const importXprv = require("./views/importXprv");
|
|
||||||
const addressDetail = require("./views/addressDetail");
|
const addressDetail = require("./views/addressDetail");
|
||||||
const addressToken = require("./views/addressToken");
|
const addressToken = require("./views/addressToken");
|
||||||
const send = require("./views/send");
|
const send = require("./views/send");
|
||||||
@@ -55,8 +53,6 @@ const ctx = {
|
|||||||
renderWalletList,
|
renderWalletList,
|
||||||
doRefreshAndRender,
|
doRefreshAndRender,
|
||||||
showAddWalletView: () => addWallet.show(),
|
showAddWalletView: () => addWallet.show(),
|
||||||
showImportKeyView: () => importKey.show(),
|
|
||||||
showImportXprvView: () => importXprv.show(),
|
|
||||||
showAddressDetail: () => addressDetail.show(),
|
showAddressDetail: () => addressDetail.show(),
|
||||||
showAddressToken: () => addressToken.show(),
|
showAddressToken: () => addressToken.show(),
|
||||||
showAddTokenView: () => addToken.show(),
|
showAddTokenView: () => addToken.show(),
|
||||||
@@ -211,8 +207,6 @@ async function init() {
|
|||||||
|
|
||||||
welcome.init(ctx);
|
welcome.init(ctx);
|
||||||
addWallet.init(ctx);
|
addWallet.init(ctx);
|
||||||
importKey.init(ctx);
|
|
||||||
importXprv.init(ctx);
|
|
||||||
home.init(ctx);
|
home.init(ctx);
|
||||||
addressDetail.init(ctx);
|
addressDetail.init(ctx);
|
||||||
addressToken.init(ctx);
|
addressToken.init(ctx);
|
||||||
|
|||||||
@@ -3,114 +3,272 @@ const {
|
|||||||
generateMnemonic,
|
generateMnemonic,
|
||||||
hdWalletFromMnemonic,
|
hdWalletFromMnemonic,
|
||||||
isValidMnemonic,
|
isValidMnemonic,
|
||||||
|
addressFromPrivateKey,
|
||||||
|
hdWalletFromXprv,
|
||||||
|
isValidXprv,
|
||||||
} = require("../../shared/wallet");
|
} = require("../../shared/wallet");
|
||||||
const { encryptWithPassword } = require("../../shared/vault");
|
const { encryptWithPassword } = require("../../shared/vault");
|
||||||
const { state, saveState } = require("../../shared/state");
|
const { state, saveState } = require("../../shared/state");
|
||||||
const { scanForAddresses } = require("../../shared/balances");
|
const { scanForAddresses } = require("../../shared/balances");
|
||||||
|
|
||||||
|
let currentMode = "mnemonic";
|
||||||
|
|
||||||
|
const MODES = ["mnemonic", "privkey", "xprv"];
|
||||||
|
|
||||||
|
const PASSWORD_HINTS = {
|
||||||
|
mnemonic:
|
||||||
|
"This password encrypts your recovery phrase on this device. You will need it to send funds.",
|
||||||
|
privkey:
|
||||||
|
"This password encrypts your private key on this device. You will need it to send funds.",
|
||||||
|
xprv: "This password encrypts your key on this device. You will need it to send funds.",
|
||||||
|
};
|
||||||
|
|
||||||
|
function switchMode(mode) {
|
||||||
|
currentMode = mode;
|
||||||
|
for (const m of MODES) {
|
||||||
|
$("add-wallet-section-" + m).classList.toggle("hidden", m !== mode);
|
||||||
|
$("tab-" + m).classList.toggle("bg-fg", m === mode);
|
||||||
|
$("tab-" + m).classList.toggle("text-bg", m === mode);
|
||||||
|
}
|
||||||
|
$("add-wallet-password-hint").textContent = PASSWORD_HINTS[mode];
|
||||||
|
}
|
||||||
|
|
||||||
function show() {
|
function show() {
|
||||||
$("wallet-mnemonic").value = "";
|
$("wallet-mnemonic").value = "";
|
||||||
|
$("import-private-key").value = "";
|
||||||
|
$("import-xprv-key").value = "";
|
||||||
$("add-wallet-password").value = "";
|
$("add-wallet-password").value = "";
|
||||||
$("add-wallet-password-confirm").value = "";
|
$("add-wallet-password-confirm").value = "";
|
||||||
$("add-wallet-phrase-warning").classList.add("hidden");
|
$("add-wallet-phrase-warning").classList.add("hidden");
|
||||||
|
switchMode("mnemonic");
|
||||||
showView("add-wallet");
|
showView("add-wallet");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function validatePassword() {
|
||||||
|
const pw = $("add-wallet-password").value;
|
||||||
|
const pw2 = $("add-wallet-password-confirm").value;
|
||||||
|
if (!pw) {
|
||||||
|
showFlash("Please choose a password.");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
if (pw.length < 12) {
|
||||||
|
showFlash("Password must be at least 12 characters.");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
if (pw !== pw2) {
|
||||||
|
showFlash("Passwords do not match.");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
return pw;
|
||||||
|
}
|
||||||
|
|
||||||
|
async function importMnemonic(ctx) {
|
||||||
|
const mnemonic = $("wallet-mnemonic").value.trim();
|
||||||
|
if (!mnemonic) {
|
||||||
|
showFlash("Enter a recovery phrase or press the die to generate one.");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const words = mnemonic.split(/\s+/);
|
||||||
|
if (words.length !== 12 && words.length !== 24) {
|
||||||
|
showFlash(
|
||||||
|
"Recovery phrase must be 12 or 24 words. You entered " +
|
||||||
|
words.length +
|
||||||
|
".",
|
||||||
|
);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (!isValidMnemonic(mnemonic)) {
|
||||||
|
showFlash("Invalid recovery phrase. Check for typos.");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const pw = validatePassword();
|
||||||
|
if (!pw) return;
|
||||||
|
const { xpub, firstAddress } = hdWalletFromMnemonic(mnemonic);
|
||||||
|
const duplicate = state.wallets.find(
|
||||||
|
(w) =>
|
||||||
|
w.type === "hd" &&
|
||||||
|
w.addresses[0] &&
|
||||||
|
w.addresses[0].address.toLowerCase() === firstAddress.toLowerCase(),
|
||||||
|
);
|
||||||
|
if (duplicate) {
|
||||||
|
showFlash(
|
||||||
|
"This recovery phrase is already added (" + duplicate.name + ").",
|
||||||
|
);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const encrypted = await encryptWithPassword(mnemonic, pw);
|
||||||
|
const walletNum = state.wallets.length + 1;
|
||||||
|
const wallet = {
|
||||||
|
type: "hd",
|
||||||
|
name: "Wallet " + walletNum,
|
||||||
|
xpub: xpub,
|
||||||
|
encryptedSecret: encrypted,
|
||||||
|
nextIndex: 1,
|
||||||
|
addresses: [
|
||||||
|
{ address: firstAddress, balance: "0.0000", tokenBalances: [] },
|
||||||
|
],
|
||||||
|
};
|
||||||
|
state.wallets.push(wallet);
|
||||||
|
state.hasWallet = true;
|
||||||
|
await saveState();
|
||||||
|
ctx.renderWalletList();
|
||||||
|
showView("main");
|
||||||
|
|
||||||
|
// Scan for used HD addresses beyond index 0.
|
||||||
|
showFlash("Scanning for addresses...", 30000);
|
||||||
|
const scan = await scanForAddresses(xpub, state.rpcUrl);
|
||||||
|
if (scan.addresses.length > 1) {
|
||||||
|
wallet.addresses = scan.addresses.map((a) => ({
|
||||||
|
address: a.address,
|
||||||
|
balance: "0.0000",
|
||||||
|
tokenBalances: [],
|
||||||
|
}));
|
||||||
|
wallet.nextIndex = scan.nextIndex;
|
||||||
|
await saveState();
|
||||||
|
ctx.renderWalletList();
|
||||||
|
showFlash("Found " + scan.addresses.length + " addresses.");
|
||||||
|
} else {
|
||||||
|
showFlash("Ready.", 1000);
|
||||||
|
}
|
||||||
|
|
||||||
|
ctx.doRefreshAndRender();
|
||||||
|
}
|
||||||
|
|
||||||
|
async function importPrivateKey(ctx) {
|
||||||
|
const key = $("import-private-key").value.trim();
|
||||||
|
if (!key) {
|
||||||
|
showFlash("Please enter your private key.");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
let addr;
|
||||||
|
try {
|
||||||
|
addr = addressFromPrivateKey(key);
|
||||||
|
} catch (e) {
|
||||||
|
showFlash("Invalid private key.");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const pw = validatePassword();
|
||||||
|
if (!pw) return;
|
||||||
|
const duplicate = state.wallets.find(
|
||||||
|
(w) =>
|
||||||
|
w.type === "key" &&
|
||||||
|
w.addresses[0] &&
|
||||||
|
w.addresses[0].address.toLowerCase() === addr.toLowerCase(),
|
||||||
|
);
|
||||||
|
if (duplicate) {
|
||||||
|
showFlash(
|
||||||
|
"This private key is already added (" + duplicate.name + ").",
|
||||||
|
);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const encrypted = await encryptWithPassword(key, pw);
|
||||||
|
const walletNum = state.wallets.length + 1;
|
||||||
|
state.wallets.push({
|
||||||
|
type: "key",
|
||||||
|
name: "Wallet " + walletNum,
|
||||||
|
encryptedSecret: encrypted,
|
||||||
|
addresses: [{ address: addr, balance: "0.0000", tokenBalances: [] }],
|
||||||
|
});
|
||||||
|
state.hasWallet = true;
|
||||||
|
await saveState();
|
||||||
|
ctx.renderWalletList();
|
||||||
|
showView("main");
|
||||||
|
|
||||||
|
ctx.doRefreshAndRender();
|
||||||
|
}
|
||||||
|
|
||||||
|
async function importXprvKey(ctx) {
|
||||||
|
const xprv = $("import-xprv-key").value.trim();
|
||||||
|
if (!xprv) {
|
||||||
|
showFlash("Please enter your extended private key.");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (!isValidXprv(xprv)) {
|
||||||
|
showFlash("Invalid extended private key.");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
let result;
|
||||||
|
try {
|
||||||
|
result = hdWalletFromXprv(xprv);
|
||||||
|
} catch (e) {
|
||||||
|
showFlash("Invalid extended private key.");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const { xpub, firstAddress } = result;
|
||||||
|
const duplicate = state.wallets.find(
|
||||||
|
(w) =>
|
||||||
|
(w.type === "hd" || w.type === "xprv") &&
|
||||||
|
w.addresses[0] &&
|
||||||
|
w.addresses[0].address.toLowerCase() === firstAddress.toLowerCase(),
|
||||||
|
);
|
||||||
|
if (duplicate) {
|
||||||
|
showFlash("This key is already added (" + duplicate.name + ").");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const pw = validatePassword();
|
||||||
|
if (!pw) return;
|
||||||
|
const encrypted = await encryptWithPassword(xprv, pw);
|
||||||
|
const walletNum = state.wallets.length + 1;
|
||||||
|
const wallet = {
|
||||||
|
type: "xprv",
|
||||||
|
name: "Wallet " + walletNum,
|
||||||
|
xpub: xpub,
|
||||||
|
encryptedSecret: encrypted,
|
||||||
|
nextIndex: 1,
|
||||||
|
addresses: [
|
||||||
|
{ address: firstAddress, balance: "0.0000", tokenBalances: [] },
|
||||||
|
],
|
||||||
|
};
|
||||||
|
state.wallets.push(wallet);
|
||||||
|
state.hasWallet = true;
|
||||||
|
await saveState();
|
||||||
|
ctx.renderWalletList();
|
||||||
|
showView("main");
|
||||||
|
|
||||||
|
// Scan for used HD addresses beyond index 0.
|
||||||
|
showFlash("Scanning for addresses...", 30000);
|
||||||
|
const scan = await scanForAddresses(xpub, state.rpcUrl);
|
||||||
|
if (scan.addresses.length > 1) {
|
||||||
|
wallet.addresses = scan.addresses.map((a) => ({
|
||||||
|
address: a.address,
|
||||||
|
balance: "0.0000",
|
||||||
|
tokenBalances: [],
|
||||||
|
}));
|
||||||
|
wallet.nextIndex = scan.nextIndex;
|
||||||
|
await saveState();
|
||||||
|
ctx.renderWalletList();
|
||||||
|
showFlash("Found " + scan.addresses.length + " addresses.");
|
||||||
|
} else {
|
||||||
|
showFlash("Ready.", 1000);
|
||||||
|
}
|
||||||
|
|
||||||
|
ctx.doRefreshAndRender();
|
||||||
|
}
|
||||||
|
|
||||||
function init(ctx) {
|
function init(ctx) {
|
||||||
|
// Tab click handlers
|
||||||
|
$("tab-mnemonic").addEventListener("click", () => switchMode("mnemonic"));
|
||||||
|
$("tab-privkey").addEventListener("click", () => switchMode("privkey"));
|
||||||
|
$("tab-xprv").addEventListener("click", () => switchMode("xprv"));
|
||||||
|
|
||||||
|
// Generate mnemonic
|
||||||
$("btn-generate-phrase").addEventListener("click", () => {
|
$("btn-generate-phrase").addEventListener("click", () => {
|
||||||
$("wallet-mnemonic").value = generateMnemonic();
|
$("wallet-mnemonic").value = generateMnemonic();
|
||||||
$("add-wallet-phrase-warning").classList.remove("hidden");
|
$("add-wallet-phrase-warning").classList.remove("hidden");
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// Import / confirm
|
||||||
$("btn-add-wallet-confirm").addEventListener("click", async () => {
|
$("btn-add-wallet-confirm").addEventListener("click", async () => {
|
||||||
const mnemonic = $("wallet-mnemonic").value.trim();
|
if (currentMode === "mnemonic") {
|
||||||
if (!mnemonic) {
|
await importMnemonic(ctx);
|
||||||
showFlash(
|
} else if (currentMode === "privkey") {
|
||||||
"Enter a recovery phrase or press the die to generate one.",
|
await importPrivateKey(ctx);
|
||||||
);
|
} else if (currentMode === "xprv") {
|
||||||
return;
|
await importXprvKey(ctx);
|
||||||
}
|
}
|
||||||
const words = mnemonic.split(/\s+/);
|
|
||||||
if (words.length !== 12 && words.length !== 24) {
|
|
||||||
showFlash(
|
|
||||||
"Recovery phrase must be 12 or 24 words. You entered " +
|
|
||||||
words.length +
|
|
||||||
".",
|
|
||||||
);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (!isValidMnemonic(mnemonic)) {
|
|
||||||
showFlash("Invalid recovery phrase. Check for typos.");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
const pw = $("add-wallet-password").value;
|
|
||||||
const pw2 = $("add-wallet-password-confirm").value;
|
|
||||||
if (!pw) {
|
|
||||||
showFlash("Please choose a password.");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (pw.length < 12) {
|
|
||||||
showFlash("Password must be at least 12 characters.");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (pw !== pw2) {
|
|
||||||
showFlash("Passwords do not match.");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
const { xpub, firstAddress } = hdWalletFromMnemonic(mnemonic);
|
|
||||||
const duplicate = state.wallets.find(
|
|
||||||
(w) =>
|
|
||||||
w.type === "hd" &&
|
|
||||||
w.addresses[0] &&
|
|
||||||
w.addresses[0].address.toLowerCase() ===
|
|
||||||
firstAddress.toLowerCase(),
|
|
||||||
);
|
|
||||||
if (duplicate) {
|
|
||||||
showFlash(
|
|
||||||
"This recovery phrase is already added (" +
|
|
||||||
duplicate.name +
|
|
||||||
").",
|
|
||||||
);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
const encrypted = await encryptWithPassword(mnemonic, pw);
|
|
||||||
const walletNum = state.wallets.length + 1;
|
|
||||||
const wallet = {
|
|
||||||
type: "hd",
|
|
||||||
name: "Wallet " + walletNum,
|
|
||||||
xpub: xpub,
|
|
||||||
encryptedSecret: encrypted,
|
|
||||||
nextIndex: 1,
|
|
||||||
addresses: [
|
|
||||||
{ address: firstAddress, balance: "0.0000", tokenBalances: [] },
|
|
||||||
],
|
|
||||||
};
|
|
||||||
state.wallets.push(wallet);
|
|
||||||
state.hasWallet = true;
|
|
||||||
await saveState();
|
|
||||||
ctx.renderWalletList();
|
|
||||||
showView("main");
|
|
||||||
|
|
||||||
// Scan for used HD addresses beyond index 0.
|
|
||||||
showFlash("Scanning for addresses...", 30000);
|
|
||||||
const scan = await scanForAddresses(xpub, state.rpcUrl);
|
|
||||||
if (scan.addresses.length > 1) {
|
|
||||||
wallet.addresses = scan.addresses.map((a) => ({
|
|
||||||
address: a.address,
|
|
||||||
balance: "0.0000",
|
|
||||||
tokenBalances: [],
|
|
||||||
}));
|
|
||||||
wallet.nextIndex = scan.nextIndex;
|
|
||||||
await saveState();
|
|
||||||
ctx.renderWalletList();
|
|
||||||
showFlash("Found " + scan.addresses.length + " addresses.");
|
|
||||||
} else {
|
|
||||||
showFlash("Ready.", 1000);
|
|
||||||
}
|
|
||||||
|
|
||||||
ctx.doRefreshAndRender();
|
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// Back button
|
||||||
$("btn-add-wallet-back").addEventListener("click", () => {
|
$("btn-add-wallet-back").addEventListener("click", () => {
|
||||||
if (!state.hasWallet) {
|
if (!state.hasWallet) {
|
||||||
showView("welcome");
|
showView("welcome");
|
||||||
@@ -119,16 +277,6 @@ function init(ctx) {
|
|||||||
showView("main");
|
showView("main");
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
$("btn-add-wallet-import-key").addEventListener(
|
|
||||||
"click",
|
|
||||||
ctx.showImportKeyView,
|
|
||||||
);
|
|
||||||
|
|
||||||
$("btn-add-wallet-import-xprv").addEventListener(
|
|
||||||
"click",
|
|
||||||
ctx.showImportXprvView,
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
module.exports = { init, show };
|
module.exports = { init, show };
|
||||||
|
|||||||
@@ -13,7 +13,6 @@ const { state, saveState } = require("../../shared/state");
|
|||||||
const VIEWS = [
|
const VIEWS = [
|
||||||
"welcome",
|
"welcome",
|
||||||
"add-wallet",
|
"add-wallet",
|
||||||
"import-key",
|
|
||||||
"main",
|
"main",
|
||||||
"address",
|
"address",
|
||||||
"address-token",
|
"address-token",
|
||||||
|
|||||||
@@ -1,69 +0,0 @@
|
|||||||
const { $, showView, showFlash } = require("./helpers");
|
|
||||||
const { addressFromPrivateKey } = require("../../shared/wallet");
|
|
||||||
const { encryptWithPassword } = require("../../shared/vault");
|
|
||||||
const { state, saveState } = require("../../shared/state");
|
|
||||||
|
|
||||||
function show() {
|
|
||||||
$("import-private-key").value = "";
|
|
||||||
$("import-key-password").value = "";
|
|
||||||
$("import-key-password-confirm").value = "";
|
|
||||||
showView("import-key");
|
|
||||||
}
|
|
||||||
|
|
||||||
function init(ctx) {
|
|
||||||
$("btn-import-key-confirm").addEventListener("click", async () => {
|
|
||||||
const key = $("import-private-key").value.trim();
|
|
||||||
if (!key) {
|
|
||||||
showFlash("Please enter your private key.");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
let addr;
|
|
||||||
try {
|
|
||||||
addr = addressFromPrivateKey(key);
|
|
||||||
} catch (e) {
|
|
||||||
showFlash("Invalid private key.");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
const pw = $("import-key-password").value;
|
|
||||||
const pw2 = $("import-key-password-confirm").value;
|
|
||||||
if (!pw) {
|
|
||||||
showFlash("Please choose a password.");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (pw.length < 12) {
|
|
||||||
showFlash("Password must be at least 12 characters.");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (pw !== pw2) {
|
|
||||||
showFlash("Passwords do not match.");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
const encrypted = await encryptWithPassword(key, pw);
|
|
||||||
const walletNum = state.wallets.length + 1;
|
|
||||||
state.wallets.push({
|
|
||||||
type: "key",
|
|
||||||
name: "Wallet " + walletNum,
|
|
||||||
encryptedSecret: encrypted,
|
|
||||||
addresses: [
|
|
||||||
{ address: addr, balance: "0.0000", tokenBalances: [] },
|
|
||||||
],
|
|
||||||
});
|
|
||||||
state.hasWallet = true;
|
|
||||||
await saveState();
|
|
||||||
ctx.renderWalletList();
|
|
||||||
showView("main");
|
|
||||||
|
|
||||||
ctx.doRefreshAndRender();
|
|
||||||
});
|
|
||||||
|
|
||||||
$("btn-import-key-back").addEventListener("click", () => {
|
|
||||||
if (!state.hasWallet) {
|
|
||||||
showView("welcome");
|
|
||||||
} else {
|
|
||||||
ctx.renderWalletList();
|
|
||||||
showView("main");
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
module.exports = { init, show };
|
|
||||||
@@ -1,106 +0,0 @@
|
|||||||
const { $, showView, showFlash } = require("./helpers");
|
|
||||||
const { hdWalletFromXprv, isValidXprv } = require("../../shared/wallet");
|
|
||||||
const { encryptWithPassword } = require("../../shared/vault");
|
|
||||||
const { state, saveState } = require("../../shared/state");
|
|
||||||
const { scanForAddresses } = require("../../shared/balances");
|
|
||||||
|
|
||||||
function show() {
|
|
||||||
$("import-xprv-key").value = "";
|
|
||||||
$("import-xprv-password").value = "";
|
|
||||||
$("import-xprv-password-confirm").value = "";
|
|
||||||
showView("import-xprv");
|
|
||||||
}
|
|
||||||
|
|
||||||
function init(ctx) {
|
|
||||||
$("btn-import-xprv-confirm").addEventListener("click", async () => {
|
|
||||||
const xprv = $("import-xprv-key").value.trim();
|
|
||||||
if (!xprv) {
|
|
||||||
showFlash("Please enter your extended private key.");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (!isValidXprv(xprv)) {
|
|
||||||
showFlash("Invalid extended private key.");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
let result;
|
|
||||||
try {
|
|
||||||
result = hdWalletFromXprv(xprv);
|
|
||||||
} catch (e) {
|
|
||||||
showFlash("Invalid extended private key.");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
const { xpub, firstAddress } = result;
|
|
||||||
const duplicate = state.wallets.find(
|
|
||||||
(w) =>
|
|
||||||
(w.type === "hd" || w.type === "xprv") &&
|
|
||||||
w.addresses[0] &&
|
|
||||||
w.addresses[0].address.toLowerCase() ===
|
|
||||||
firstAddress.toLowerCase(),
|
|
||||||
);
|
|
||||||
if (duplicate) {
|
|
||||||
showFlash("This key is already added (" + duplicate.name + ").");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
const pw = $("import-xprv-password").value;
|
|
||||||
const pw2 = $("import-xprv-password-confirm").value;
|
|
||||||
if (!pw) {
|
|
||||||
showFlash("Please choose a password.");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (pw.length < 12) {
|
|
||||||
showFlash("Password must be at least 12 characters.");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (pw !== pw2) {
|
|
||||||
showFlash("Passwords do not match.");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
const encrypted = await encryptWithPassword(xprv, pw);
|
|
||||||
const walletNum = state.wallets.length + 1;
|
|
||||||
const wallet = {
|
|
||||||
type: "xprv",
|
|
||||||
name: "Wallet " + walletNum,
|
|
||||||
xpub: xpub,
|
|
||||||
encryptedSecret: encrypted,
|
|
||||||
nextIndex: 1,
|
|
||||||
addresses: [
|
|
||||||
{ address: firstAddress, balance: "0.0000", tokenBalances: [] },
|
|
||||||
],
|
|
||||||
};
|
|
||||||
state.wallets.push(wallet);
|
|
||||||
state.hasWallet = true;
|
|
||||||
await saveState();
|
|
||||||
ctx.renderWalletList();
|
|
||||||
showView("main");
|
|
||||||
|
|
||||||
// Scan for used HD addresses beyond index 0.
|
|
||||||
showFlash("Scanning for addresses...", 30000);
|
|
||||||
const scan = await scanForAddresses(xpub, state.rpcUrl);
|
|
||||||
if (scan.addresses.length > 1) {
|
|
||||||
wallet.addresses = scan.addresses.map((a) => ({
|
|
||||||
address: a.address,
|
|
||||||
balance: "0.0000",
|
|
||||||
tokenBalances: [],
|
|
||||||
}));
|
|
||||||
wallet.nextIndex = scan.nextIndex;
|
|
||||||
await saveState();
|
|
||||||
ctx.renderWalletList();
|
|
||||||
showFlash("Found " + scan.addresses.length + " addresses.");
|
|
||||||
} else {
|
|
||||||
showFlash("Ready.", 1000);
|
|
||||||
}
|
|
||||||
|
|
||||||
ctx.doRefreshAndRender();
|
|
||||||
});
|
|
||||||
|
|
||||||
$("btn-import-xprv-back").addEventListener("click", () => {
|
|
||||||
if (!state.hasWallet) {
|
|
||||||
showView("welcome");
|
|
||||||
} else {
|
|
||||||
ctx.renderWalletList();
|
|
||||||
showView("main");
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
module.exports = { init, show };
|
|
||||||
Reference in New Issue
Block a user