grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3732 from ethcore/jg-duplicate-accounts

Browse Source 
Give accounts precedence over address_book entries
This commit is contained in:
Robert Habermeier 2016-12-08 12:27:26 +01:00 committed by GitHub
commit de4715bc67
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/src/redux/providers/personalActions.js
View File

@ -27,7 +27,7 @@ export function personalAccountsInfo (accountsInfo) {
Object.keys(accountsInfo || {}) Object.keys(accountsInfo || {})
.map((address) => Object.assign({}, accountsInfo[address], { address })) .map((address) => Object.assign({}, accountsInfo[address], { address }))
.filter((account) => !account.meta.deleted) .filter((account) => account.uuid || !account.meta.deleted)
.forEach((account) => { .forEach((account) => {
if (account.uuid) { if (account.uuid) {
accounts[account.address] = account; accounts[account.address] = account;

2
js/src/ui/IdentityName/identityName.js
View File

@ -37,7 +37,7 @@ class IdentityName extends Component {
render () { render () {
const { address, accountsInfo, tokens, empty, name, shorten, unknown, className } = this.props; const { address, accountsInfo, tokens, empty, name, shorten, unknown, className } = this.props;
const account = accountsInfo[address] || tokens[address]; const account = accountsInfo[address] || tokens[address];
const hasAccount = account && (!account.meta || !account.meta.deleted); const hasAccount = account && (account.uuid || !account.meta || !account.meta.deleted);
if (!hasAccount && empty) { if (!hasAccount && empty) {
return null; return null;

2
rpc/src/v1/impls/parity_accounts.rs
View File

@ -57,7 +57,7 @@ impl<C: 'static> ParityAccounts for ParityAccountsClient<C> where C: MiningBlock
let info = try!(store.accounts_info().map_err(|e| errors::account("Could not fetch account info.", e))); let info = try!(store.accounts_info().map_err(|e| errors::account("Could not fetch account info.", e)));
let other = store.addresses_info().expect("addresses_info always returns Ok; qed"); let other = store.addresses_info().expect("addresses_info always returns Ok; qed");
Ok(info.into_iter().chain(other.into_iter()).map(|(a, v)| { Ok(other.into_iter().chain(info.into_iter()).map(|(a, v)| {
let m = map![ let m = map![
"name".to_owned() => to_value(&v.name), "name".to_owned() => to_value(&v.name),
"meta".to_owned() => to_value(&v.meta), "meta".to_owned() => to_value(&v.meta),