Skip to content

fix: Incorrect passphrase on react-wallet #97

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
macterra merged 4 commits into from
Feb 19, 2026
Merged

fix: Incorrect passphrase on react-wallet #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
536a116
fix: Show actual error instead of masking all errors as "Incorrect pa…
macterra Feb 18, 2026
e9a83d6
fix: Replace crypto.subtle with @noble libraries for passphrase encry…
macterra Feb 18, 2026
eb2a2b4
refactor: Move passphrase encryption from keymaster to cipher package
macterra Feb 18, 2026
ea898df
fix: Remove platform-specific rollup workaround from root package.json
macterra Feb 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions apps/chrome-extension/src/contexts/WalletProvider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import { StoredWallet, WalletBase } from "@didcid/keymaster/types";
import PassphraseModal from "../modals/PassphraseModal";
import WarningModal from "../modals/WarningModal";
import MnemonicModal from "../modals/MnemonicModal";
import { encMnemonic } from '@didcid/keymaster/encryption';
import { encryptWithPassphrase } from '@didcid/cipher/passphrase';
import WalletJsonMemory from "@didcid/keymaster/wallet/json-memory";

const gatekeeper = new GatekeeperClient();
Expand Down Expand Up @@ -277,7 +277,7 @@ export function WalletProvider({ children, isBrowser }: { children: ReactNode, i
return;
}

const mnemonicEnc = await encMnemonic(recoveredMnemonic, newPassphrase);
const mnemonicEnc = await encryptWithPassphrase(recoveredMnemonic, newPassphrase);
const updated = {
version: base.version,
seed: { mnemonicEnc },
Expand Down
2 changes: 1 addition & 1 deletion apps/chrome-extension/webpack.common.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ module.exports = {
"@didcid/keymaster/wallet/typeGuards": path.resolve(__dirname, "../../packages/keymaster/dist/esm/db/typeGuards.js"),
"@didcid/keymaster/types": path.resolve(__dirname, "../../packages/keymaster/dist/types/types.d.js"),
"@didcid/keymaster/search": path.resolve(__dirname, "../../packages/keymaster/dist/esm/search-client.js"),
"@didcid/keymaster/encryption": path.resolve(__dirname, "../../packages/keymaster/dist/esm/encryption.js"),
"@didcid/cipher/passphrase": path.resolve(__dirname, "../../packages/cipher/dist/esm/passphrase.js"),
"@didcid/keymaster": path.resolve(__dirname, "../../packages/keymaster/dist/esm/keymaster.js"),
},
fallback: {
Expand Down
22 changes: 16 additions & 6 deletions apps/react-wallet/src/contexts/WalletProvider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import WalletJsonMemory from "@didcid/keymaster/wallet/json-memory";
import PassphraseModal from "../modals/PassphraseModal";
import WarningModal from "../modals/WarningModal";
import MnemonicModal from "../modals/MnemonicModal";
import { encMnemonic } from '@didcid/keymaster/encryption';
import { encryptWithPassphrase } from '@didcid/cipher/passphrase';
import { takeDeepLink } from '../utils/deepLinkQueue';
import { extractDid } from '../utils/utils';
import {
Expand Down Expand Up @@ -115,8 +115,13 @@ export function WalletProvider({ children }: { children: ReactNode }) {
try {
// check pass & convert to v1 if needed
await instance.loadWallet();
} catch {
setPassphraseErrorText(INCORRECT_PASSPHRASE);
} catch (error: any) {
const message = error?.message || String(error);
if (message.includes('Incorrect passphrase')) {
setPassphraseErrorText(INCORRECT_PASSPHRASE);
} else {
setPassphraseErrorText(message);
}
return false;
}
}
Expand Down Expand Up @@ -151,8 +156,13 @@ export function WalletProvider({ children }: { children: ReactNode }) {
// check pass
await km.loadWallet();
await walletWeb.saveWallet(pendingWallet as StoredWallet, true);
} catch {
setPassphraseErrorText(INCORRECT_PASSPHRASE);
} catch (error: any) {
const message = error?.message || String(error);
if (message.includes('Incorrect passphrase')) {
setPassphraseErrorText(INCORRECT_PASSPHRASE);
} else {
setPassphraseErrorText(message);
}
return;
}
}
Expand Down Expand Up @@ -304,7 +314,7 @@ export function WalletProvider({ children }: { children: ReactNode }) {
return;
}

const mnemonicEnc = await encMnemonic(recoveredMnemonic, newPassphrase);
const mnemonicEnc = await encryptWithPassphrase(recoveredMnemonic, newPassphrase);
const updated = {
version: base.version,
seed: { mnemonicEnc },
Expand Down
4 changes: 2 additions & 2 deletions apps/react-wallet/src/modals/PassphraseModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ interface PassphraseModalProps {
isOpen: boolean,
title: string,
errorText: string,
onSubmit: (passphrase: string) => void,
onSubmit: (passphrase: string) => void | Promise<void>,
onClose?: () => void,
encrypt: boolean,
showCancel?: boolean,
Expand Down Expand Up @@ -59,7 +59,7 @@ const PassphraseModal: React.FC<PassphraseModalProps> = (
await new Promise(requestAnimationFrame);

try {
onSubmit(passphrase);
await onSubmit(passphrase);
setPassphrase("");
setConfirmPassphrase("");
} finally {
Expand Down
3 changes: 2 additions & 1 deletion apps/react-wallet/vite.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ export default defineConfig({
},
resolve: {
alias: {
"@didcid/cipher/passphrase": path.resolve(__dirname, "../../packages/cipher/dist/esm/passphrase.js"),
"@didcid/cipher/web": path.resolve(__dirname, "../../packages/cipher/dist/esm/cipher-web.js"),
"@didcid/common/errors": path.resolve(__dirname, "../../packages/common/dist/esm/errors.js"),
"@didcid/gatekeeper/client": path.resolve(__dirname, "../../packages/gatekeeper/dist/esm/gatekeeper-client.js"),
Expand All @@ -24,7 +25,7 @@ export default defineConfig({
"@didcid/keymaster/wallet/typeGuards": path.resolve(__dirname, "../../packages/keymaster/dist/esm/db/typeGuards.js"),
"@didcid/keymaster/types": path.resolve(__dirname, "../../packages/keymaster/dist/types/types.d.js"),
"@didcid/keymaster/search": path.resolve(__dirname, "../../packages/keymaster/dist/esm/search-client.js"),
"@didcid/keymaster/encryption": path.resolve(__dirname, "../../packages/keymaster/dist/esm/encryption.js"),

"@didcid/keymaster": path.resolve(__dirname, "../../packages/keymaster/dist/esm/keymaster.js"),
buffer: 'buffer',
}
Expand Down
2 changes: 1 addition & 1 deletion jest.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ const config = {
'^@didcid/keymaster$': '<rootDir>/packages/keymaster/src/keymaster.ts',
'^@didcid/keymaster/client$': '<rootDir>/packages/keymaster/src/keymaster-client.ts',
'^@didcid/keymaster/wallet/(.*)$': '<rootDir>/packages/keymaster/src/db/$1',
'^@didcid/keymaster/encryption': '<rootDir>/packages/keymaster/src/encryption.ts',
'^@didcid/cipher/passphrase': '<rootDir>/packages/cipher/src/passphrase.ts',
'^\\.\\/typeGuards\\.js$': '<rootDir>/packages/keymaster/src/db/typeGuards.ts',
'^\\.\\/db\\/typeGuards\\.js$': '<rootDir>/packages/keymaster/src/db/typeGuards.ts',
'^\\.\\/abstract-json\\.js$': '<rootDir>/packages/gatekeeper/src/db/abstract-json.ts',
Expand Down
Loading
Loading