Skip to content

fix: clear registered tokens and nano contracts when exiting a hardware wallet #884

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

Draft
raul-oliveira wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

fix: clear registered tokens and nano contracts when exiting a hardware wallet #884

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion src/App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,8 +375,9 @@ function DefaultComponent({ children }) {
// If this is a hardware wallet that has been locked, navigate to the "Wallet Type" screen
if (isLockedScreen &&
LOCAL_STORE.isHardwareWallet()) {
// This exit path bypasses resetStorage, so clear the registered data too.
LOCAL_STORE.cleanWallet({ cleanRegisteredData: true });
// This will redirect the page to Wallet Type screen
LOCAL_STORE.cleanWallet();
return <Navigate to={'/wallet_type/'} />;
}

Expand Down
15 changes: 13 additions & 2 deletions src/storage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,12 +271,23 @@ export class LocalStorageStore {
}

/**
* Clean wallet metadata
* Clean wallet metadata.
*
* @param {Object} [options]
* @param {boolean} [options.cleanRegisteredData=false] Also drop the
* wallet-scoped registered tokens, nano contracts and Ledger token
* signatures. Used by exit paths that bypass resetStorage, so this data
* doesn't leak into the next wallet.
*/
cleanWallet() {
cleanWallet({ cleanRegisteredData = false } = {}) {
this.removeItem(IS_HARDWARE_KEY);
this.removeItem(CLOSED_KEY);
this.removeItem(ACCESS_DATA_KEY);
if (cleanRegisteredData) {
this.removeItem(REGISTERED_TOKENS_KEY);
this.removeItem(REGISTERED_NANOCONTRACTS_KEY);
this.removeItem(TOKEN_SIGNATURES_KEY);
}
delete this._storage;
this._storage = null;
}
Expand Down
Loading