{
const account = accountsInfo[address];
- return !account.uuid && account.meta.deleted;
+ return !account.uuid && account.meta && account.meta.deleted;
})
.map((address) => this._api.parity.removeAddress(address))
);
diff --git a/js/src/redux/providers/personalActions.js b/js/src/redux/providers/personalActions.js
index 01ba13b53..edafbef31 100644
--- a/js/src/redux/providers/personalActions.js
+++ b/js/src/redux/providers/personalActions.js
@@ -26,7 +26,6 @@ import WalletsUtils from '~/util/wallets';
import { wallet as WalletAbi } from '~/contracts/abi';
export function personalAccountsInfo (accountsInfo) {
- const addresses = [];
const accounts = {};
const contacts = {};
const contracts = {};
@@ -35,10 +34,9 @@ export function personalAccountsInfo (accountsInfo) {
Object.keys(accountsInfo || {})
.map((address) => Object.assign({}, accountsInfo[address], { address }))
- .filter((account) => account.uuid || !account.meta.deleted)
+ .filter((account) => account.meta && (account.uuid || !account.meta.deleted))
.forEach((account) => {
if (account.uuid) {
- addresses.push(account.address);
accounts[account.address] = account;
} else if (account.meta.wallet) {
account.wallet = true;
@@ -87,18 +85,45 @@ export function personalAccountsInfo (accountsInfo) {
return [];
})
.then((_wallets) => {
- _wallets.forEach((wallet) => {
- const owners = wallet.owners.map((o) => o.address);
+ // We want to separate owned wallets and other wallets
+ // However, wallets can be owned by wallets, that can
+ // be owned by an account...
+ let otherWallets = [].concat(_wallets);
+ let prevLength;
+ let nextLength;
- // Owners ∩ Addresses not null : Wallet is owned
- // by one of the accounts
- if (intersection(owners, addresses).length > 0) {
- accounts[wallet.address] = wallet;
- } else {
- contacts[wallet.address] = wallet;
- }
+ // If no more other wallets, or if the size decreased, continue...
+ do {
+ prevLength = otherWallets.length;
+
+ otherWallets = otherWallets
+ .map((wallet) => {
+ const addresses = Object.keys(accounts);
+ const owners = wallet.owners.map((o) => o.address);
+
+ // Owners ∩ Addresses not null : Wallet is owned
+ // by one of the accounts
+ if (intersection(owners, addresses).length > 0) {
+ accounts[wallet.address] = wallet;
+ return false;
+ }
+
+ return wallet;
+ })
+ .filter((wallet) => wallet);
+
+ nextLength = otherWallets.length;
+ } while (nextLength < prevLength);
+
+ // And other wallets to contacts...
+ otherWallets.forEach((wallet) => {
+ contacts[wallet.address] = wallet;
});
+ // Cache the _real_ accounts for
+ // WalletsUtils (used for sending transactions)
+ WalletsUtils.cacheAccounts(accounts);
+
dispatch(_personalAccountsInfo({
accountsInfo,
accounts,
diff --git a/js/src/redux/providers/walletActions.js b/js/src/redux/providers/walletActions.js
index a37f04d15..b31a2b35b 100644
--- a/js/src/redux/providers/walletActions.js
+++ b/js/src/redux/providers/walletActions.js
@@ -431,22 +431,7 @@ function parseLogs (logs) {
return;
}
- const { wallet } = getState();
- const { contract } = wallet;
- const walletInstance = contract.instance;
-
- const signatures = {
- OwnerChanged: toHex(walletInstance.OwnerChanged.signature),
- OwnerAdded: toHex(walletInstance.OwnerAdded.signature),
- OwnerRemoved: toHex(walletInstance.OwnerRemoved.signature),
- RequirementChanged: toHex(walletInstance.RequirementChanged.signature),
- Confirmation: toHex(walletInstance.Confirmation.signature),
- Revoke: toHex(walletInstance.Revoke.signature),
- Deposit: toHex(walletInstance.Deposit.signature),
- SingleTransact: toHex(walletInstance.SingleTransact.signature),
- MultiTransact: toHex(walletInstance.MultiTransact.signature),
- ConfirmationNeeded: toHex(walletInstance.ConfirmationNeeded.signature)
- };
+ const WalletSignatures = WalletsUtils.getWalletSignatures();
const updates = {};
@@ -459,25 +444,25 @@ function parseLogs (logs) {
};
switch (eventSignature) {
- case signatures.OwnerChanged:
- case signatures.OwnerAdded:
- case signatures.OwnerRemoved:
+ case WalletSignatures.OwnerChanged:
+ case WalletSignatures.OwnerAdded:
+ case WalletSignatures.OwnerRemoved:
updates[address] = {
...prev,
[ UPDATE_OWNERS ]: true
};
return;
- case signatures.RequirementChanged:
+ case WalletSignatures.RequirementChanged:
updates[address] = {
...prev,
[ UPDATE_REQUIRE ]: true
};
return;
- case signatures.ConfirmationNeeded:
- case signatures.Confirmation:
- case signatures.Revoke:
+ case WalletSignatures.ConfirmationNeeded:
+ case WalletSignatures.Confirmation:
+ case WalletSignatures.Revoke:
const operation = bytesToHex(log.params.operation.value);
updates[address] = {
@@ -489,9 +474,11 @@ function parseLogs (logs) {
return;
- case signatures.Deposit:
- case signatures.SingleTransact:
- case signatures.MultiTransact:
+ case WalletSignatures.Deposit:
+ case WalletSignatures.SingleTransact:
+ case WalletSignatures.MultiTransact:
+ case WalletSignatures.Old.SingleTransact:
+ case WalletSignatures.Old.MultiTransact:
updates[address] = {
...prev,
[ UPDATE_TRANSACTIONS ]: true
diff --git a/js/src/ui/Icons/index.js b/js/src/ui/Icons/index.js
index ff3e86b26..aae962a88 100644
--- a/js/src/ui/Icons/index.js
+++ b/js/src/ui/Icons/index.js
@@ -31,6 +31,7 @@ export DashboardIcon from 'material-ui/svg-icons/action/dashboard';
export DeleteIcon from 'material-ui/svg-icons/action/delete';
export DevelopIcon from 'material-ui/svg-icons/action/description';
export DoneIcon from 'material-ui/svg-icons/action/done-all';
+export DialIcon from 'material-ui/svg-icons/communication/dialpad';
export EditIcon from 'material-ui/svg-icons/content/create';
export ErrorIcon from 'material-ui/svg-icons/alert/error';
export FileUploadIcon from 'material-ui/svg-icons/file/file-upload';
diff --git a/js/src/ui/MethodDecoding/methodDecoding.js b/js/src/ui/MethodDecoding/methodDecoding.js
index 25f031c62..87edb7779 100644
--- a/js/src/ui/MethodDecoding/methodDecoding.js
+++ b/js/src/ui/MethodDecoding/methodDecoding.js
@@ -120,6 +120,18 @@ class MethodDecoding extends Component {
{ gas.toFormat(0) } gas ({ gasPrice.div(1000000).toFormat(0) }M/ETH)
+ {
+ transaction.gasUsed
+ ? (
+
+ used
+
+ { transaction.gasUsed.toFormat(0) } gas
+
+
+ )
+ : null
+ }
for a total transaction value of
{ this.renderEtherValue(gasValue) }
{ this.renderMinBlock() }
diff --git a/js/src/ui/ModalBox/modalBox.js b/js/src/ui/ModalBox/modalBox.js
index f0366cf06..d74dc1c6e 100644
--- a/js/src/ui/ModalBox/modalBox.js
+++ b/js/src/ui/ModalBox/modalBox.js
@@ -22,13 +22,13 @@ import styles from './modalBox.css';
export default class ModalBox extends Component {
static propTypes = {
- children: PropTypes.node.isRequired,
+ children: PropTypes.node,
icon: PropTypes.node.isRequired,
summary: nodeOrStringProptype()
}
render () {
- const { children, icon } = this.props;
+ const { icon } = this.props;
return (
@@ -37,14 +37,26 @@ export default class ModalBox extends Component {
{ this.renderSummary() }
-
- { children }
-
+ { this.renderBody() }
+ { children }
+
+ );
+ }
+
renderSummary () {
const { summary } = this.props;
diff --git a/js/src/ui/SectionList/sectionList.css b/js/src/ui/SectionList/sectionList.css
index c6b3765ff..14e8bffd1 100644
--- a/js/src/ui/SectionList/sectionList.css
+++ b/js/src/ui/SectionList/sectionList.css
@@ -17,7 +17,6 @@
$transition: all 0.25s;
$widthNormal: 33.33%;
-$widthShrunk: 29%;
$widthExpanded: 42%;
.section {
@@ -39,18 +38,19 @@ $widthExpanded: 42%;
display: flex;
justify-content: center;
- /* TODO: As per JS comments, the flex-base could be adjusted in the future to allow for */
+ /* TODO: As per JS comments, the flex-base could be adjusted in the future to allow for
/* case where <> 3 columns are required should the need arrise from a UI pov. */
.item {
box-sizing: border-box;
display: flex;
flex: 0 1 $widthNormal;
- max-width: $widthNormal;
opacity: 0.85;
padding: 0.25em;
+
/* https://www.binarymoon.co.uk/2014/02/fixing-css-transitions-in-google-chrome/ */
transform: translateZ(0);
transition: $transition;
+ width: 0;
&:hover {
opacity: 1;
@@ -58,22 +58,13 @@ $widthExpanded: 42%;
}
}
- &:hover {
- .item {
- &.stretchOn {
- flex: 0 1 $widthShrunk;
- max-width: $widthShrunk;
-
- &:hover {
- flex: 0 0 $widthExpanded;
- max-width: $widthExpanded;
- }
- }
- }
+ .item.stretchOn:hover {
+ flex: 0 0 $widthExpanded;
+ max-width: $widthExpanded;
}
}
}
-.section+.section {
+.section + .section {
margin-top: 1em;
}
diff --git a/js/src/ui/TxList/store.js b/js/src/ui/TxList/store.js
index 1a3c2a2ff..1e670e31d 100644
--- a/js/src/ui/TxList/store.js
+++ b/js/src/ui/TxList/store.js
@@ -51,6 +51,7 @@ export default class Store {
return bnB.comparedTo(bnA);
});
+
this._pendingHashes = this.sortedHashes.filter((hash) => this.transactions[hash].blockNumber.eq(0));
});
}
@@ -85,26 +86,53 @@ export default class Store {
this._subscriptionId = 0;
}
- loadTransactions (_txhashes) {
- const txhashes = _txhashes.filter((hash) => !this.transactions[hash] || this._pendingHashes.includes(hash));
+ loadTransactions (_txhashes = []) {
+ const promises = _txhashes
+ .filter((txhash) => !this.transactions[txhash] || this._pendingHashes.includes(txhash))
+ .map((txhash) => {
+ return Promise
+ .all([
+ this._api.eth.getTransactionByHash(txhash),
+ this._api.eth.getTransactionReceipt(txhash)
+ ])
+ .then(([
+ transaction = {},
+ transactionReceipt = {}
+ ]) => {
+ return {
+ ...transactionReceipt,
+ ...transaction
+ };
+ });
+ });
- if (!txhashes || !txhashes.length) {
+ if (!promises.length) {
return;
}
Promise
- .all(txhashes.map((txhash) => this._api.eth.getTransactionByHash(txhash)))
+ .all(promises)
.then((_transactions) => {
- const transactions = _transactions.filter((tx) => tx);
+ const blockNumbers = [];
+ const transactions = _transactions
+ .filter((tx) => tx && tx.hash)
+ .reduce((txs, tx) => {
+ txs[tx.hash] = tx;
- this.addTransactions(
- transactions.reduce((transactions, tx, index) => {
- transactions[txhashes[index]] = tx;
- return transactions;
- }, {})
- );
+ if (tx.blockNumber && tx.blockNumber.gt(0)) {
+ blockNumbers.push(tx.blockNumber.toNumber());
+ }
- this.loadBlocks(transactions.map((tx) => tx.blockNumber ? tx.blockNumber.toNumber() : 0));
+ return txs;
+ }, {});
+
+ // No need to add transactions if there are none
+ if (Object.keys(transactions).length === 0) {
+ return false;
+ }
+
+ this.addTransactions(transactions);
+ this.loadBlocks(blockNumbers);
})
.catch((error) => {
console.warn('loadTransactions', error);
diff --git a/js/src/ui/TxList/txList.js b/js/src/ui/TxList/txList.js
index f3043a47f..c2224903f 100644
--- a/js/src/ui/TxList/txList.js
+++ b/js/src/ui/TxList/txList.js
@@ -27,7 +27,7 @@ import styles from './txList.css';
class TxList extends Component {
static contextTypes = {
api: PropTypes.object.isRequired
- }
+ };
static propTypes = {
address: PropTypes.string.isRequired,
@@ -36,7 +36,7 @@ class TxList extends Component {
PropTypes.object
]).isRequired,
netVersion: PropTypes.string.isRequired
- }
+ };
store = new Store(this.context.api);
diff --git a/js/src/util/tx.js b/js/src/util/tx.js
index 49ffee3da..8a48a3d26 100644
--- a/js/src/util/tx.js
+++ b/js/src/util/tx.js
@@ -61,17 +61,6 @@ export function estimateGas (_func, _options, _values = []) {
const { func, options, values } = callArgs;
return func._estimateGas(options, values);
- })
- .then((gas) => {
- return WalletsUtils
- .isWallet(_func.contract.api, _options.from)
- .then((isWallet) => {
- if (isWallet) {
- return gas.mul(1.5);
- }
-
- return gas;
- });
});
}
@@ -84,6 +73,114 @@ export function postTransaction (_func, _options, _values = []) {
});
}
+export function deploy (contract, _options, values, metadata = {}, statecb = () => {}) {
+ const options = { ..._options };
+ const { api } = contract;
+ const address = options.from;
+
+ return WalletsUtils
+ .isWallet(api, address)
+ .then((isWallet) => {
+ if (!isWallet) {
+ return contract.deploy(options, values, statecb);
+ }
+
+ statecb(null, { state: 'estimateGas' });
+
+ return deployEstimateGas(contract, options, values)
+ .then(([gasEst, gas]) => {
+ options.gas = gas.toFixed(0);
+
+ statecb(null, { state: 'postTransaction', gas });
+
+ return WalletsUtils.getDeployArgs(contract, options, values);
+ })
+ .then((callArgs) => {
+ const { func, options, values } = callArgs;
+
+ return func._postTransaction(options, values)
+ .then((requestId) => {
+ statecb(null, { state: 'checkRequest', requestId });
+ return contract._pollCheckRequest(requestId);
+ })
+ .then((txhash) => {
+ statecb(null, { state: 'getTransactionReceipt', txhash });
+ return contract._pollTransactionReceipt(txhash, options.gas);
+ })
+ .then((receipt) => {
+ if (receipt.gasUsed.eq(options.gas)) {
+ throw new Error(`Contract not deployed, gasUsed == ${options.gas.toFixed(0)}`);
+ }
+
+ const logs = WalletsUtils.parseLogs(api, receipt.logs || []);
+
+ const confirmationLog = logs.find((log) => log.event === 'ConfirmationNeeded');
+ const transactionLog = logs.find((log) => log.event === 'SingleTransact');
+
+ if (!confirmationLog && !transactionLog) {
+ throw new Error('Something went wrong in the Wallet Contract (no logs have been emitted)...');
+ }
+
+ // Confirmations are needed from the other owners
+ if (confirmationLog) {
+ const operationHash = api.util.bytesToHex(confirmationLog.params.operation.value);
+
+ // Add the contract to pending contracts
+ WalletsUtils.addPendingContract(address, operationHash, metadata);
+ statecb(null, { state: 'confirmationNeeded' });
+ return;
+ }
+
+ // Set the contract address in the receip
+ receipt.contractAddress = transactionLog.params.created.value;
+
+ const contractAddress = receipt.contractAddress;
+
+ statecb(null, { state: 'hasReceipt', receipt });
+ contract._receipt = receipt;
+ contract._address = contractAddress;
+
+ statecb(null, { state: 'getCode' });
+
+ return api.eth.getCode(contractAddress)
+ .then((code) => {
+ if (code === '0x') {
+ throw new Error('Contract not deployed, getCode returned 0x');
+ }
+
+ statecb(null, { state: 'completed' });
+ return contractAddress;
+ });
+ });
+ });
+ });
+}
+
+export function deployEstimateGas (contract, _options, values) {
+ const options = { ..._options };
+ const { api } = contract;
+ const address = options.from;
+
+ return WalletsUtils
+ .isWallet(api, address)
+ .then((isWallet) => {
+ if (!isWallet) {
+ return contract.deployEstimateGas(options, values);
+ }
+
+ return WalletsUtils
+ .getDeployArgs(contract, options, values)
+ .then((callArgs) => {
+ const { func, options, values } = callArgs;
+
+ return func.estimateGas(options, values);
+ })
+ .then((gasEst) => {
+ return [gasEst, gasEst.mul(1.05)];
+ });
+ });
+}
+
export function patchApi (api) {
api.patch = {
...api.patch,
diff --git a/js/src/util/wallets.js b/js/src/util/wallets.js
index 3bc86f6ed..904f77900 100644
--- a/js/src/util/wallets.js
+++ b/js/src/util/wallets.js
@@ -16,59 +16,154 @@
import BigNumber from 'bignumber.js';
import { intersection, range, uniq } from 'lodash';
+import store from 'store';
+import Abi from '~/abi';
import Contract from '~/api/contract';
import { bytesToHex, toHex } from '~/api/util/format';
import { validateAddress } from '~/util/validation';
import WalletAbi from '~/contracts/abi/wallet.json';
+import OldWalletAbi from '~/contracts/abi/old-wallet.json';
+
+const LS_PENDING_CONTRACTS_KEY = '_parity::wallets::pendingContracts';
const _cachedWalletLookup = {};
+let _cachedAccounts = {};
+
+const walletAbi = new Abi(WalletAbi);
+const oldWalletAbi = new Abi(OldWalletAbi);
+
+const walletEvents = walletAbi.events.reduce((events, event) => {
+ events[event.name] = event;
+ return events;
+}, {});
+
+const oldWalletEvents = oldWalletAbi.events.reduce((events, event) => {
+ events[event.name] = event;
+ return events;
+}, {});
+
+const WalletSignatures = {
+ OwnerChanged: toHex(walletEvents.OwnerChanged.signature),
+ OwnerAdded: toHex(walletEvents.OwnerAdded.signature),
+ OwnerRemoved: toHex(walletEvents.OwnerRemoved.signature),
+ RequirementChanged: toHex(walletEvents.RequirementChanged.signature),
+ Confirmation: toHex(walletEvents.Confirmation.signature),
+ Revoke: toHex(walletEvents.Revoke.signature),
+ Deposit: toHex(walletEvents.Deposit.signature),
+ SingleTransact: toHex(walletEvents.SingleTransact.signature),
+ MultiTransact: toHex(walletEvents.MultiTransact.signature),
+ ConfirmationNeeded: toHex(walletEvents.ConfirmationNeeded.signature),
+
+ Old: {
+ SingleTransact: toHex(oldWalletEvents.SingleTransact.signature),
+ MultiTransact: toHex(oldWalletEvents.MultiTransact.signature)
+ }
+};
export default class WalletsUtils {
+ static getWalletSignatures () {
+ return WalletSignatures;
+ }
+
+ static getPendingContracts () {
+ return store.get(LS_PENDING_CONTRACTS_KEY) || {};
+ }
+
+ static setPendingContracts (contracts = {}) {
+ return store.set(LS_PENDING_CONTRACTS_KEY, contracts);
+ }
+
+ static removePendingContract (operationHash) {
+ const nextContracts = WalletsUtils.getPendingContracts();
+
+ delete nextContracts[operationHash];
+ WalletsUtils.setPendingContracts(nextContracts);
+ }
+
+ static addPendingContract (address, operationHash, metadata) {
+ const nextContracts = {
+ ...WalletsUtils.getPendingContracts(),
+ [ operationHash ]: {
+ address,
+ metadata,
+ operationHash
+ }
+ };
+
+ WalletsUtils.setPendingContracts(nextContracts);
+ }
+
+ static cacheAccounts (accounts) {
+ _cachedAccounts = accounts;
+ }
+
static getCallArgs (api, options, values = []) {
const walletContract = new Contract(api, WalletAbi);
+ const walletAddress = options.from;
- const promises = [
- api.parity.accountsInfo(),
- WalletsUtils.fetchOwners(walletContract.at(options.from))
- ];
+ return WalletsUtils
+ .fetchOwners(walletContract.at(walletAddress))
+ .then((owners) => {
+ const addresses = Object.keys(_cachedAccounts);
+ const ownerAddress = intersection(addresses, owners).pop();
- return Promise
- .all(promises)
- .then(([ accounts, owners ]) => {
- const addresses = Object.keys(accounts);
- const owner = intersection(addresses, owners).pop();
-
- if (!owner) {
+ if (!ownerAddress) {
return false;
}
- return owner;
- })
- .then((owner) => {
- if (!owner) {
- return false;
- }
-
- const _options = Object.assign({}, options);
- const { from, to, value = new BigNumber(0), data } = options;
+ const account = _cachedAccounts[ownerAddress];
+ const _options = { ...options };
+ const { to, value = new BigNumber(0), data } = _options;
delete _options.data;
const nextValues = [ to, value, data ];
const nextOptions = {
..._options,
- from: owner,
- to: from,
+ from: ownerAddress,
+ to: walletAddress,
value: new BigNumber(0)
};
const execFunc = walletContract.instance.execute;
+ const callArgs = { func: execFunc, options: nextOptions, values: nextValues };
- return { func: execFunc, options: nextOptions, values: nextValues };
+ if (!account.wallet) {
+ return callArgs;
+ }
+
+ const nextData = walletContract.getCallData(execFunc, nextOptions, nextValues);
+
+ return WalletsUtils.getCallArgs(api, { ...nextOptions, data: nextData }, nextValues);
});
}
+ static getDeployArgs (contract, options, values) {
+ const { api } = contract;
+ const func = contract.constructors[0];
+
+ options.data = contract.getCallData(func, options, values);
+ options.to = '0x';
+
+ return WalletsUtils
+ .getCallArgs(api, options, values)
+ .then((callArgs) => {
+ if (!callArgs) {
+ console.error('no call args', callArgs);
+ throw new Error('you do not own this wallet');
+ }
+
+ return callArgs;
+ });
+ }
+
+ static parseLogs (api, logs = []) {
+ const walletContract = new Contract(api, WalletAbi);
+
+ return walletContract.parseEventLogs(logs);
+ }
+
/**
* Check whether the given address could be
* a Wallet. The result is cached in order not
@@ -199,16 +294,18 @@ export default class WalletsUtils {
}
static fetchTransactions (walletContract) {
- const walletInstance = walletContract.instance;
- const signatures = {
- single: toHex(walletInstance.SingleTransact.signature),
- multi: toHex(walletInstance.MultiTransact.signature),
- deposit: toHex(walletInstance.Deposit.signature)
- };
+ const { api } = walletContract;
+ const pendingContracts = WalletsUtils.getPendingContracts();
return walletContract
.getAllLogs({
- topics: [ [ signatures.single, signatures.multi, signatures.deposit ] ]
+ topics: [ [
+ WalletSignatures.SingleTransact,
+ WalletSignatures.MultiTransact,
+ WalletSignatures.Deposit,
+ WalletSignatures.Old.SingleTransact,
+ WalletSignatures.Old.MultiTransact
+ ] ]
})
.then((logs) => {
return logs.sort((logA, logB) => {
@@ -226,11 +323,11 @@ export default class WalletsUtils {
const signature = toHex(log.topics[0]);
const value = log.params.value.value;
- const from = signature === signatures.deposit
+ const from = signature === WalletSignatures.Deposit
? log.params['_from'].value
: walletContract.address;
- const to = signature === signatures.deposit
+ const to = signature === WalletSignatures.Deposit
? walletContract.address
: log.params.to.value;
@@ -240,8 +337,53 @@ export default class WalletsUtils {
from, to, value
};
+ if (log.params.created && log.params.created.value && !/^(0x)?0*$/.test(log.params.created.value)) {
+ transaction.creates = log.params.created.value;
+ delete transaction.to;
+ }
+
if (log.params.operation) {
- transaction.operation = bytesToHex(log.params.operation.value);
+ const operation = bytesToHex(log.params.operation.value);
+
+ // Add the pending contract to the contracts
+ if (pendingContracts[operation]) {
+ const { metadata } = pendingContracts[operation];
+ const contractName = metadata.name;
+
+ metadata.blockNumber = log.blockNumber;
+
+ // The contract creation might not be in the same log,
+ // but must be in the same transaction (eg. Contract creation
+ // from Wallet within a Wallet)
+ api.eth
+ .getTransactionReceipt(log.transactionHash)
+ .then((transactionReceipt) => {
+ const transactionLogs = WalletsUtils.parseLogs(api, transactionReceipt.logs);
+ const creationLog = transactionLogs.find((log) => {
+ return log.params.created && !/^(0x)?0*$/.test(log.params.created.value);
+ });
+
+ if (!creationLog) {
+ return false;
+ }
+
+ const contractAddress = creationLog.params.created.value;
+
+ return Promise
+ .all([
+ api.parity.setAccountName(contractAddress, contractName),
+ api.parity.setAccountMeta(contractAddress, metadata)
+ ])
+ .then(() => {
+ WalletsUtils.removePendingContract(operation);
+ });
+ })
+ .catch((error) => {
+ console.error('adding wallet contract', error);
+ });
+ }
+
+ transaction.operation = operation;
}
if (log.params.data) {
diff --git a/js/src/views/Account/account.js b/js/src/views/Account/account.js
index 197bda591..c2b600be8 100644
--- a/js/src/views/Account/account.js
+++ b/js/src/views/Account/account.js
@@ -22,11 +22,11 @@ import { bindActionCreators } from 'redux';
import shapeshiftBtn from '~/../assets/images/shapeshift-btn.png';
import HardwareStore from '~/mobx/hardwareStore';
-import { EditMeta, DeleteAccount, Shapeshift, Verification, Transfer, PasswordManager } from '~/modals';
+import { DeleteAccount, EditMeta, Faucet, PasswordManager, Shapeshift, Transfer, Verification } from '~/modals';
import { setVisibleAccounts } from '~/redux/providers/personalActions';
import { fetchCertifiers, fetchCertifications } from '~/redux/providers/certifications/actions';
import { Actionbar, Button, Page } from '~/ui';
-import { DeleteIcon, EditIcon, LockedIcon, SendIcon, VerifyIcon } from '~/ui/Icons';
+import { DeleteIcon, DialIcon, EditIcon, LockedIcon, SendIcon, VerifyIcon } from '~/ui/Icons';
import DeleteAddress from '../Address/Delete';
@@ -48,6 +48,8 @@ class Account extends Component {
accounts: PropTypes.object,
balances: PropTypes.object,
+ certifications: PropTypes.object,
+ netVersion: PropTypes.string.isRequired,
params: PropTypes.object
}
@@ -97,6 +99,7 @@ class Account extends Component {
{ this.renderDeleteDialog(account) }
{ this.renderEditDialog(account) }
+ { this.renderFaucetDialog() }
{ this.renderFundDialog() }
{ this.renderPasswordDialog(account) }
{ this.renderTransferDialog(account, balance) }
@@ -117,8 +120,35 @@ class Account extends Component {
);
}
+ isKovan = (netVersion) => {
+ return netVersion === '42';
+ }
+
+ isMainnet = (netVersion) => {
+ return netVersion === '1';
+ }
+
+ isFaucettable = (netVersion, certifications, address) => {
+ return this.isKovan(netVersion) || (
+ this.isMainnet(netVersion) &&
+ this.isSmsCertified(certifications, address)
+ );
+ }
+
+ isSmsCertified = (_certifications, address) => {
+ const certifications = _certifications && _certifications[address]
+ ? _certifications[address].filter((cert) => cert.name.indexOf('smsverification') === 0)
+ : [];
+
+ return certifications.length !== 0;
+ }
+
renderActionbar (account, balance) {
+ const { certifications, netVersion } = this.props;
+ const { address } = this.props.params;
const showTransferButton = !!(balance && balance.tokens);
+ const isVerifiable = this.isMainnet(netVersion);
+ const isFaucettable = this.isFaucettable(netVersion, certifications, address);
const buttons = [
,
- }
- key='sms-verification'
- label={
- }
+ key='verification'
+ label={
+
+ }
+ onClick={ this.store.toggleVerificationDialog }
/>
- }
- onClick={ this.store.toggleVerificationDialog }
- />,
+ )
+ : null,
+ isFaucettable
+ ? (
+ }
+ key='faucet'
+ label={
+
+ }
+ onClick={ this.store.toggleFaucetDialog }
+ />
+ )
+ : null,
}
key='editmeta'
@@ -253,6 +302,24 @@ class Account extends Component {
);
}
+ renderFaucetDialog () {
+ const { netVersion } = this.props;
+
+ if (!this.store.isFaucetVisible) {
+ return null;
+ }
+
+ const { address } = this.props.params;
+
+ return (
+
+ );
+ }
+
renderFundDialog () {
if (!this.store.isFundVisible) {
return null;
@@ -317,10 +384,14 @@ class Account extends Component {
function mapStateToProps (state) {
const { accounts } = state.personal;
const { balances } = state.balances;
+ const certifications = state.certifications;
+ const { netVersion } = state.nodeStatus;
return {
accounts,
- balances
+ balances,
+ certifications,
+ netVersion
};
}
diff --git a/js/src/views/Account/account.spec.js b/js/src/views/Account/account.spec.js
index 932e30719..6a96d6300 100644
--- a/js/src/views/Account/account.spec.js
+++ b/js/src/views/Account/account.spec.js
@@ -80,57 +80,16 @@ describe('views/Account', () => {
describe('sub-renderers', () => {
describe('renderActionBar', () => {
let bar;
- let barShallow;
beforeEach(() => {
render();
bar = instance.renderActionbar({ tokens: {} });
- barShallow = shallow(bar);
});
it('renders the bar', () => {
expect(bar.type).to.match(/Actionbar/);
});
-
- // TODO: Finding by index is not optimal, however couldn't find a better method atm
- // since we cannot find by key (prop not visible in shallow debug())
- describe('clicks', () => {
- it('toggles transfer on click', () => {
- barShallow.find('Button').at(0).simulate('click');
- expect(store.isTransferVisible).to.be.true;
- });
-
- it('toggles fund on click', () => {
- barShallow.find('Button').at(1).simulate('click');
- expect(store.isFundVisible).to.be.true;
- });
-
- it('toggles fund on click', () => {
- barShallow.find('Button').at(1).simulate('click');
- expect(store.isFundVisible).to.be.true;
- });
-
- it('toggles verify on click', () => {
- barShallow.find('Button').at(2).simulate('click');
- expect(store.isVerificationVisible).to.be.true;
- });
-
- it('toggles edit on click', () => {
- barShallow.find('Button').at(3).simulate('click');
- expect(store.isEditVisible).to.be.true;
- });
-
- it('toggles password on click', () => {
- barShallow.find('Button').at(4).simulate('click');
- expect(store.isPasswordVisible).to.be.true;
- });
-
- it('toggles delete on click', () => {
- barShallow.find('Button').at(5).simulate('click');
- expect(store.isDeleteVisible).to.be.true;
- });
- });
});
describe('renderDeleteDialog', () => {
diff --git a/js/src/views/Account/store.js b/js/src/views/Account/store.js
index 5b8fe58a0..45a9a7a8c 100644
--- a/js/src/views/Account/store.js
+++ b/js/src/views/Account/store.js
@@ -19,6 +19,7 @@ import { action, observable } from 'mobx';
export default class Store {
@observable isDeleteVisible = false;
@observable isEditVisible = false;
+ @observable isFaucetVisible = false;
@observable isFundVisible = false;
@observable isPasswordVisible = false;
@observable isTransferVisible = false;
@@ -32,6 +33,10 @@ export default class Store {
this.isEditVisible = !this.isEditVisible;
}
+ @action toggleFaucetDialog = () => {
+ this.isFaucetVisible = !this.isFaucetVisible;
+ }
+
@action toggleFundDialog = () => {
this.isFundVisible = !this.isFundVisible;
}
diff --git a/js/src/views/Account/store.spec.js b/js/src/views/Account/store.spec.js
index 408266254..9608b55a3 100644
--- a/js/src/views/Account/store.spec.js
+++ b/js/src/views/Account/store.spec.js
@@ -31,6 +31,7 @@ describe('views/Account/Store', () => {
it('sets all modal visibility to false', () => {
expect(store.isDeleteVisible).to.be.false;
expect(store.isEditVisible).to.be.false;
+ expect(store.isFaucetVisible).to.be.false;
expect(store.isFundVisible).to.be.false;
expect(store.isPasswordVisible).to.be.false;
expect(store.isTransferVisible).to.be.false;
@@ -53,6 +54,13 @@ describe('views/Account/Store', () => {
});
});
+ describe('toggleFaucetDialog', () => {
+ it('toggles the visibility', () => {
+ store.toggleFaucetDialog();
+ expect(store.isFaucetVisible).to.be.true;
+ });
+ });
+
describe('toggleFundDialog', () => {
it('toggles the visibility', () => {
store.toggleFundDialog();
diff --git a/js/src/views/Signer/store.js b/js/src/views/Signer/store.js
index ad50bad87..76e3522f8 100644
--- a/js/src/views/Signer/store.js
+++ b/js/src/views/Signer/store.js
@@ -41,8 +41,9 @@ export default class SignerStore {
this.balances = Object.assign({}, this.balances, balances);
}
- @action setLocalHashes = (localHashes) => {
- if (!isEqual(localHashes, this.localHashes)) {
+ @action setLocalHashes = (localHashes = []) => {
+ // Use slice to make sure they are both Arrays (MobX uses Objects for Observable Arrays)
+ if (!isEqual(localHashes.slice(), this.localHashes.slice())) {
this.localHashes = localHashes;
}
}
diff --git a/js/src/views/Wallet/Transactions/transactions.js b/js/src/views/Wallet/Transactions/transactions.js
index 0ef853a70..aa1fae672 100644
--- a/js/src/views/Wallet/Transactions/transactions.js
+++ b/js/src/views/Wallet/Transactions/transactions.js
@@ -71,7 +71,7 @@ export default class WalletTransactions extends Component {
}
const txRows = transactions.slice(0, 15).map((transaction, index) => {
- const { transactionHash, blockNumber, from, to, value, data } = transaction;
+ const { transactionHash, data } = transaction;
return (
);