From 4fc1c5f42e424d86669898530f2ef22a19afeca1 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Tue, 25 Oct 2016 15:15:22 +0200 Subject: [PATCH] Remove personal_* calls from dapps (#2860) * remove accountsInfo & listAccounts * registry accounts selector works --- js/src/dapps/basiccoin/Application/application.js | 5 +++-- js/src/dapps/gavcoin/Application/application.js | 9 +++++---- js/src/dapps/gavcoin/Events/Event/event.js | 2 +- js/src/dapps/githubhint/services.js | 9 +++++---- js/src/dapps/registry/addresses/actions.js | 13 +++++-------- js/src/dapps/registry/ui/address.js | 4 ++-- js/src/dapps/signaturereg/services.js | 7 ++++--- js/src/dapps/tokenreg/Accounts/actions.js | 8 ++++---- js/src/dapps/tokenreg/Status/actions.js | 2 +- 9 files changed, 30 insertions(+), 29 deletions(-) diff --git a/js/src/dapps/basiccoin/Application/application.js b/js/src/dapps/basiccoin/Application/application.js index 1e268e720..d84085c98 100644 --- a/js/src/dapps/basiccoin/Application/application.js +++ b/js/src/dapps/basiccoin/Application/application.js @@ -16,7 +16,7 @@ import React, { Component, PropTypes } from 'react'; -import { api } from '../parity'; +// import { api } from '../parity'; import { attachInstances } from '../services'; import Header from './Header'; @@ -83,9 +83,10 @@ export default class Application extends Component { Promise .all([ attachInstances(), - api.personal.accountsInfo() + null // api.personal.accountsInfo() ]) .then(([{ managerInstance, registryInstance, tokenregInstance }, accountsInfo]) => { + accountsInfo = accountsInfo || {}; this.setState({ loading: false, managerInstance, diff --git a/js/src/dapps/gavcoin/Application/application.js b/js/src/dapps/gavcoin/Application/application.js index 04c5abe01..29c86c78d 100644 --- a/js/src/dapps/gavcoin/Application/application.js +++ b/js/src/dapps/gavcoin/Application/application.js @@ -205,11 +205,12 @@ export default class Application extends Component { return Promise .all([ registry.getAddress.call({}, [api.util.sha3('gavcoin'), 'A']), - api.personal.listAccounts(), - api.personal.accountsInfo() + api.eth.accounts(), + null // api.personal.accountsInfo() ]); }) .then(([address, addresses, infos]) => { + infos = infos || {}; console.log(`gavcoin was found at ${address}`); const contract = api.newContract(abis.gavcoin, address); @@ -220,11 +221,11 @@ export default class Application extends Component { contract, instance: contract.instance, accounts: addresses.map((address) => { - const info = infos[address]; + const info = infos[address] || {}; return { address, - name: info.name || 'Unnamed', + name: info.name, uuid: info.uuid }; }) diff --git a/js/src/dapps/gavcoin/Events/Event/event.js b/js/src/dapps/gavcoin/Events/Event/event.js index 4fb29a382..0b4094ac0 100644 --- a/js/src/dapps/gavcoin/Events/Event/event.js +++ b/js/src/dapps/gavcoin/Events/Event/event.js @@ -80,7 +80,7 @@ export default class Event extends Component { const { accounts } = this.context; const account = accounts.find((_account) => _account.address === address); - if (account) { + if (account && account.name) { return (
{ account.name } diff --git a/js/src/dapps/githubhint/services.js b/js/src/dapps/githubhint/services.js index ee198ff6d..1904be2d7 100644 --- a/js/src/dapps/githubhint/services.js +++ b/js/src/dapps/githubhint/services.js @@ -28,21 +28,22 @@ export function attachInterface () { return Promise .all([ registry.getAddress.call({}, [api.util.sha3('githubhint'), 'A']), - api.personal.listAccounts(), - api.personal.accountsInfo() + api.eth.accounts(), + null // api.personal.accountsInfo() ]); }) .then(([address, addresses, accountsInfo]) => { + accountsInfo = accountsInfo || {}; console.log(`githubhint was found at ${address}`); const contract = api.newContract(abis.githubhint, address); const accounts = addresses.reduce((obj, address) => { - const info = accountsInfo[address]; + const info = accountsInfo[address] || {}; return Object.assign(obj, { [address]: { address, - name: info.name || 'Unnamed', + name: info.name, uuid: info.uuid } }); diff --git a/js/src/dapps/registry/addresses/actions.js b/js/src/dapps/registry/addresses/actions.js index b6091acb5..dfd7d16a3 100644 --- a/js/src/dapps/registry/addresses/actions.js +++ b/js/src/dapps/registry/addresses/actions.js @@ -21,16 +21,13 @@ export const set = (addresses) => ({ type: 'addresses set', addresses }); export const fetch = () => (dispatch) => { return Promise .all([ - api.personal.listAccounts(), - api.personal.accountsInfo() + api.eth.accounts(), + null // api.personal.accountsInfo() ]) .then(([ accounts, data ]) => { - const addresses = Object.keys(data) - .filter((address) => data[address] && !data[address].meta.deleted) - .map((address) => ({ - ...data[address], address, - isAccount: accounts.includes(address) - })); + const addresses = accounts.map((address) => { + return { address, isAccount: true }; + }); dispatch(set(addresses)); }) .catch((error) => { diff --git a/js/src/dapps/registry/ui/address.js b/js/src/dapps/registry/ui/address.js index e4a5a953e..f0b9d65da 100644 --- a/js/src/dapps/registry/ui/address.js +++ b/js/src/dapps/registry/ui/address.js @@ -32,9 +32,9 @@ const align = { export default (address, accounts, contacts, shortenHash = true) => { let caption; if (accounts[address]) { - caption = ({ accounts[address].name }); + caption = ({ accounts[address].name || address }); } else if (contacts[address]) { - caption = ({ contacts[address].name }); + caption = ({ contacts[address].name || address }); } else { caption = ({ shortenHash ? renderHash(address) : address }); } diff --git a/js/src/dapps/signaturereg/services.js b/js/src/dapps/signaturereg/services.js index 3963d394c..3942f75cc 100644 --- a/js/src/dapps/signaturereg/services.js +++ b/js/src/dapps/signaturereg/services.js @@ -46,16 +46,17 @@ export function attachInterface (callback) { return Promise .all([ registry.getAddress.call({}, [api.util.sha3('signaturereg'), 'A']), - api.personal.listAccounts(), - api.personal.accountsInfo() + api.eth.accounts(), + null // api.personal.accountsInfo() ]); }) .then(([address, addresses, accountsInfo]) => { + accountsInfo = accountsInfo || {}; console.log(`signaturereg was found at ${address}`); const contract = api.newContract(abis.signaturereg, address); const accounts = addresses.reduce((obj, address) => { - const info = accountsInfo[address]; + const info = accountsInfo[address] || {}; return Object.assign(obj, { [address]: { diff --git a/js/src/dapps/tokenreg/Accounts/actions.js b/js/src/dapps/tokenreg/Accounts/actions.js index 2e597f2e5..f093b5300 100644 --- a/js/src/dapps/tokenreg/Accounts/actions.js +++ b/js/src/dapps/tokenreg/Accounts/actions.js @@ -37,11 +37,11 @@ export const setSelectedAccount = (address) => ({ export const loadAccounts = () => (dispatch) => { Promise .all([ - api.personal.listAccounts(), - api.personal.accountsInfo() + api.eth.accounts(), + null // api.personal.accountsInfo() ]) - .then(results => { - const [ accounts, accountsInfo ] = results; + .then(([ accounts, accountsInfo ]) => { + accountsInfo = accountsInfo || {}; const accountsList = accounts .map(address => ({ diff --git a/js/src/dapps/tokenreg/Status/actions.js b/js/src/dapps/tokenreg/Status/actions.js index a479179b2..9ec196aed 100644 --- a/js/src/dapps/tokenreg/Status/actions.js +++ b/js/src/dapps/tokenreg/Status/actions.js @@ -82,7 +82,7 @@ export const loadContractDetails = () => (dispatch, getState) => { Promise .all([ - api.personal.listAccounts(), + api.eth.accounts(), instance.owner.call(), instance.fee.call() ])