From b02d7cd04b7209aff44d5ad1384b3db927586225 Mon Sep 17 00:00:00 2001 From: Ivan Vershigora Date: Fri, 14 May 2021 19:21:35 +0300 Subject: [PATCH] ADD: use passphrase to get wallet ID --- class/wallets/abstract-wallet.js | 4 +++- class/wallets/slip39-wallets.js | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/class/wallets/abstract-wallet.js b/class/wallets/abstract-wallet.js index c62d4e463..4a4f66158 100644 --- a/class/wallets/abstract-wallet.js +++ b/class/wallets/abstract-wallet.js @@ -45,7 +45,9 @@ export class AbstractWallet { } getID() { - return createHash('sha256').update(this.getSecret()).digest().toString('hex'); + const passphrase = this.getPassphrase ? this.getPassphrase() : ''; + const string2hash = this.getSecret() + passphrase; + return createHash('sha256').update(string2hash).digest().toString('hex'); } getTransactions() { diff --git a/class/wallets/slip39-wallets.js b/class/wallets/slip39-wallets.js index 6aadf9d38..044ab4dbd 100644 --- a/class/wallets/slip39-wallets.js +++ b/class/wallets/slip39-wallets.js @@ -39,7 +39,7 @@ const SLIP39Mixin = { }, getID() { - const string2hash = this.secret.sort().join(','); + const string2hash = this.secret.sort().join(',') + (this.getPassphrase() || ''); return createHash('sha256').update(string2hash).digest().toString('hex'); }, };