RanchiMall/fcoin
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #346 from sangaman/rpc-getaddressesbyaccount

Browse Source 
Catch non-errors in rpc importaddress and getaddressesbyaccount
This commit is contained in:
Christopher Jeffrey (JJ) 2018-04-06 16:09:57 -07:00 committed by GitHub
commit 6208323195
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/wallet/rpc.js
View File

@ -429,7 +429,14 @@ class RPC extends RPCBase {
if (name === '') if (name === '')
name = 'default'; name = 'default';
const paths = await wallet.getPaths(name); let paths;
try {
paths = await wallet.getPaths(name);
} catch (e) {
if (e.message === 'Account not found.')
return [];
throw e;
}
for (const path of paths) { for (const path of paths) {
const addr = path.toAddress(); const addr = path.toAddress();
@ -813,7 +820,12 @@ class RPC extends RPCBase {
addr = parseAddress(addr, this.network); addr = parseAddress(addr, this.network);
} }
await wallet.importAddress(0, addr); try {
await wallet.importAddress(0, addr);
} catch (e) {
if (e.message !== 'Address already exists.')
throw e;
}
if (rescan) if (rescan)
await this.wdb.rescan(0); await this.wdb.rescan(0);