Initial new UI source code import (#2607)
* address -> name mappings * expanding, loading all coin details * send use only actual BasicCoin tokens registered (any reg) * sending token & accounts * form styling updates * send form layout in place * coin send working as expected * api subscriptions on multiple addresses * bring in events * simplify * basic events display in-place, functionally complete * basic functionality in-place * fix horrible event address issue * rwork display of events slightly * test TLA availability * table for owner -> tokens * fix signature lookup address * fix signature lookup address * basic overview styling * txhash links * page layout adjustments * background import * adjust colors * no global registration, simplify color selection * updated styling * connection dialog for "busy connecting" * initial token connection - WIP * init token updates take place * basic test for manual token * rework connection display * allow updates of the secure token * first stab at making the build build * update runner tags * fix linting issues * skip tests requiring network (should be e2e, TODO) * re-enable javascript tag/runner * release push does the trick * push to any branch, CI name * javscript-test runner as well * swap dependencies build requires test * revert stages swap * retrieve images associated with tokens * remove js build deps order * null image when hash = 0x0 * 6x64 images (hashes for registries) * don't pass tokens as prop to IdentityIcon * check images against content hash pictures * cleanup signer after connection changes * fix naming typo * display unknownImages for balances (not available as content hash) * unknownImage for transfer dialog * basic githubhint layout * single input for commit/filename * ethcore_hashContent call * lookup hash * registration in place * fixes * events is using a proper table * pass value through as-is * stop wrongly using main app IdentityIcon * NEVER export class instance functions * alignment back to normal * typo in definition * set & get images working (mostly) * show content retrieval info * set exitcode via || * use javascript:latest images * disable npm progress bar * rename phase I * rename phase II * only send build output to GitHub on major branches * also run the build step as part of the test (until comprehensive) * ci-specific build (no webpack progress) * allow for account creation via recovery phrase * display account uuid (where available), closes #2546 * connection dialog now shows up in dapps as well, closes #2538 * token images show up as expected * IdentityName component added and deployed * fix padding tests * adjust tests to map to stricter 0x-prefixed hex * render names via common component for the address -> name * split lint into seperate script (early exit) * test phases changed to lint, test & pack * pack part of test phase * remove files marked for deletion (cleanup) * Signer cleanups, start moving in the direction of the rest * add personal signer methods * basic signer request subscription * don't poll blockNumber when not connected * missing return, creating massive ws queue backlogs * ΞTH -> ETH * fix failing tests * registry uses setAddress to actually set addresses now * bytes mapping operates on lowerCase hex strings * sha3 ids for each application * add dappreg to list of contracts * adjust alignment of queries * show gas estimation log * abi with payable for register function * add key as required * image retrieval from dappreg * use proper Image urls * embed and link apps from Parity, retrieved via /api/apps * filter apps that has been replaced * proxy entry for parity-utils * add basiccoin abi * add support for fallback abi type * capture constructor paramaters * merge master into js * move images to assets/images/ * add font assets * import fonts as part of build * don't inline woff files * Revert "merge master into js" This reverts commit cfcfa81bd26f1b3cbc748d3afa1eb5c670b363fe. * remove unused npm packages * information on gas estimates (like almost everywhere else) * don't pass gas & gasPrice to estimation * display account passwordhint when available * signer subscriptions based on polling & function trapping * pending requests retrieved via jsapi * update signer middleware * remove all web3 instances * remove web3 package * last web3 dependencies removed * no need to toChecksumAddress - api takes care of it * expand description for personal_confirmRequest * Signer conversion from web3 -> parity.js completed * explicit in no return * green circle background * remove generated background * convert /api/* paths to localhost:8080/api/* paths (hard-coded, temporary) * change dapps to load from localhost:8080/ui/* * remove dangling web3 files * update manager test for signer * /api/ping -> / * additional token images * additional token images * add missing styles.css for 8180 error pages * cater for txhash returning null/empty object * adjust output directories * Release merge with origin with ours strategy * additional token images * cater for development server * s/localhost/127.0.0.1/ (cater for origin) * Fix address selection for contract deployment * Adjust z-index for error overlay * better text on unique background pattern * fix signer rejections * Don't allow gavcoin transfer with no balance * fix txhash rendering in signer * remove unnecessary ParityBackground * script to update js-precompiled * Redirect from :8080 to :8180 * Remove extra return * Dapp logo images
This commit is contained in:
167
js/src/modals/ExecuteContract/DetailsStep/detailsStep.js
Normal file
167
js/src/modals/ExecuteContract/DetailsStep/detailsStep.js
Normal file
@@ -0,0 +1,167 @@
|
||||
// Copyright 2015, 2016 Ethcore (UK) Ltd.
|
||||
// This file is part of Parity.
|
||||
|
||||
// Parity is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
|
||||
// Parity is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
import React, { Component, PropTypes } from 'react';
|
||||
import { MenuItem } from 'material-ui';
|
||||
|
||||
import { AddressSelect, Form, Input, InputAddressSelect, Select } from '../../../ui';
|
||||
|
||||
import styles from '../executeContract.css';
|
||||
|
||||
export default class DetailsStep extends Component {
|
||||
static propTypes = {
|
||||
accounts: PropTypes.object.isRequired,
|
||||
contract: PropTypes.object.isRequired,
|
||||
amount: PropTypes.string,
|
||||
amountError: PropTypes.string,
|
||||
onAmountChange: PropTypes.func.isRequired,
|
||||
fromAddress: PropTypes.string,
|
||||
fromAddressError: PropTypes.string,
|
||||
onFromAddressChange: PropTypes.func.isRequired,
|
||||
func: PropTypes.object,
|
||||
funcError: PropTypes.string,
|
||||
onFuncChange: PropTypes.func,
|
||||
values: PropTypes.array.isRequired,
|
||||
valuesError: PropTypes.array.isRequired,
|
||||
onValueChange: PropTypes.func.isRequired
|
||||
}
|
||||
|
||||
render () {
|
||||
const { accounts, amount, amountError, fromAddress, fromAddressError, onFromAddressChange, onAmountChange } = this.props;
|
||||
|
||||
return (
|
||||
<Form>
|
||||
<AddressSelect
|
||||
label='from account'
|
||||
hint='the account to transact with'
|
||||
value={ fromAddress }
|
||||
error={ fromAddressError }
|
||||
accounts={ accounts }
|
||||
onChange={ onFromAddressChange } />
|
||||
{ this.renderFunctionSelect() }
|
||||
{ this.renderParameters() }
|
||||
<Input
|
||||
label='transaction value (in ETH)'
|
||||
hint='the amount to send to with the transaction'
|
||||
value={ amount }
|
||||
error={ amountError }
|
||||
onSubmit={ onAmountChange } />
|
||||
</Form>
|
||||
);
|
||||
}
|
||||
|
||||
renderFunctionSelect () {
|
||||
const { func, funcError, contract } = this.props;
|
||||
|
||||
if (!func) {
|
||||
return null;
|
||||
}
|
||||
|
||||
const functions = contract.functions
|
||||
.filter((func) => !func.constant)
|
||||
.sort((a, b) => a.name.localeCompare(b.name))
|
||||
.map((func) => {
|
||||
const params = func.abi.inputs
|
||||
.map((input, index) => {
|
||||
return (
|
||||
<span key={ input.name }>
|
||||
<span>{ index ? ', ' : '' }</span>
|
||||
<span className={ styles.paramname }>{ input.name }: </span>
|
||||
<span>{ input.type }</span>
|
||||
</span>
|
||||
);
|
||||
});
|
||||
const name = (
|
||||
<div>
|
||||
<span>{ func.name }</span>
|
||||
<span className={ styles.paramname }>(</span>
|
||||
{ params }
|
||||
<span className={ styles.paramname }>)</span>
|
||||
</div>
|
||||
);
|
||||
|
||||
return (
|
||||
<MenuItem
|
||||
key={ func.signature }
|
||||
value={ func.signature }
|
||||
label={ func.name }>
|
||||
{ name }
|
||||
</MenuItem>
|
||||
);
|
||||
});
|
||||
|
||||
return (
|
||||
<Select
|
||||
label='function to execute'
|
||||
hint='the function to call on the contract'
|
||||
error={ funcError }
|
||||
onChange={ this.onFuncChange }
|
||||
value={ func.signature }>
|
||||
{ functions }
|
||||
</Select>
|
||||
);
|
||||
}
|
||||
|
||||
renderParameters () {
|
||||
const { accounts, func, values, valuesError, onValueChange } = this.props;
|
||||
|
||||
if (!func) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return func.abi.inputs.map((input, index) => {
|
||||
const onChange = (event, value) => onValueChange(event, index, value);
|
||||
const onSubmit = (value) => onValueChange(null, index, value);
|
||||
const label = `${input.name}: ${input.type}`;
|
||||
let inputbox;
|
||||
|
||||
switch (input.type) {
|
||||
case 'address':
|
||||
inputbox = (
|
||||
<InputAddressSelect
|
||||
accounts={ accounts }
|
||||
editing
|
||||
label={ label }
|
||||
value={ values[index] }
|
||||
error={ valuesError[index] }
|
||||
onChange={ onChange } />
|
||||
);
|
||||
break;
|
||||
|
||||
default:
|
||||
inputbox = (
|
||||
<Input
|
||||
label={ label }
|
||||
value={ values[index] }
|
||||
error={ valuesError[index] }
|
||||
onSubmit={ onSubmit } />
|
||||
);
|
||||
}
|
||||
|
||||
return (
|
||||
<div className={ styles.funcparams } key={ index }>
|
||||
{ inputbox }
|
||||
</div>
|
||||
);
|
||||
});
|
||||
}
|
||||
|
||||
onFuncChange = (event, index, signature) => {
|
||||
const { contract, onFuncChange } = this.props;
|
||||
|
||||
onFuncChange(event, contract.functions.find((fn) => fn.signature === signature));
|
||||
}
|
||||
}
|
||||
17
js/src/modals/ExecuteContract/DetailsStep/index.js
Normal file
17
js/src/modals/ExecuteContract/DetailsStep/index.js
Normal file
@@ -0,0 +1,17 @@
|
||||
// Copyright 2015, 2016 Ethcore (UK) Ltd.
|
||||
// This file is part of Parity.
|
||||
|
||||
// Parity is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
|
||||
// Parity is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
export default from './detailsStep';
|
||||
35
js/src/modals/ExecuteContract/executeContract.css
Normal file
35
js/src/modals/ExecuteContract/executeContract.css
Normal file
@@ -0,0 +1,35 @@
|
||||
/* Copyright 2015, 2016 Ethcore (UK) Ltd.
|
||||
/* This file is part of Parity.
|
||||
/*
|
||||
/* Parity is free software: you can redistribute it and/or modify
|
||||
/* it under the terms of the GNU General Public License as published by
|
||||
/* the Free Software Foundation, either version 3 of the License, or
|
||||
/* (at your option) any later version.
|
||||
/*
|
||||
/* Parity is distributed in the hope that it will be useful,
|
||||
/* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
/* GNU General Public License for more details.
|
||||
/*
|
||||
/* You should have received a copy of the GNU General Public License
|
||||
/* along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
.modalbody,
|
||||
.modalcenter {
|
||||
}
|
||||
|
||||
.modalcenter {
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.funcparams {
|
||||
padding-left: 3em;
|
||||
}
|
||||
|
||||
.paramname {
|
||||
color: #aaa;
|
||||
}
|
||||
|
||||
.txhash {
|
||||
word-break: break-all;
|
||||
}
|
||||
221
js/src/modals/ExecuteContract/executeContract.js
Normal file
221
js/src/modals/ExecuteContract/executeContract.js
Normal file
@@ -0,0 +1,221 @@
|
||||
// Copyright 2015, 2016 Ethcore (UK) Ltd.
|
||||
// This file is part of Parity.
|
||||
|
||||
// Parity is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
|
||||
// Parity is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
import React, { Component, PropTypes } from 'react';
|
||||
import ActionDoneAll from 'material-ui/svg-icons/action/done-all';
|
||||
import ContentClear from 'material-ui/svg-icons/content/clear';
|
||||
|
||||
import { BusyStep, CompletedStep, Button, IdentityIcon, Modal, TxHash } from '../../ui';
|
||||
|
||||
import DetailsStep from './DetailsStep';
|
||||
|
||||
export default class ExecuteContract extends Component {
|
||||
static contextTypes = {
|
||||
api: PropTypes.object.isRequired,
|
||||
store: PropTypes.object.isRequired
|
||||
}
|
||||
|
||||
static propTypes = {
|
||||
isTest: PropTypes.bool,
|
||||
fromAddress: PropTypes.string,
|
||||
accounts: PropTypes.object,
|
||||
contract: PropTypes.object,
|
||||
onClose: PropTypes.func.isRequired,
|
||||
onFromAddressChange: PropTypes.func.isRequired
|
||||
}
|
||||
|
||||
state = {
|
||||
amount: '0',
|
||||
amountError: null,
|
||||
func: null,
|
||||
funcError: null,
|
||||
values: [],
|
||||
valuesError: [],
|
||||
step: 0,
|
||||
sending: false,
|
||||
busyState: null,
|
||||
txhash: null
|
||||
}
|
||||
|
||||
componentDidMount () {
|
||||
const { contract } = this.props;
|
||||
const functions = contract.functions
|
||||
.filter((func) => !func.constant)
|
||||
.sort((a, b) => a.name.localeCompare(b.name));
|
||||
|
||||
this.onFuncChange(null, functions[0]);
|
||||
}
|
||||
|
||||
render () {
|
||||
const { sending } = this.state;
|
||||
|
||||
return (
|
||||
<Modal
|
||||
actions={ this.renderDialogActions() }
|
||||
title='execute function'
|
||||
busy={ sending }
|
||||
waiting={ [1] }
|
||||
visible>
|
||||
{ this.renderStep() }
|
||||
</Modal>
|
||||
);
|
||||
}
|
||||
|
||||
renderDialogActions () {
|
||||
const { onClose, fromAddress } = this.props;
|
||||
const { sending, step } = this.state;
|
||||
const cancelBtn = (
|
||||
<Button
|
||||
key='cancel'
|
||||
label='Cancel'
|
||||
icon={ <ContentClear /> }
|
||||
onClick={ onClose } />
|
||||
);
|
||||
|
||||
if (step === 0) {
|
||||
return [
|
||||
cancelBtn,
|
||||
<Button
|
||||
key='postTransaction'
|
||||
label='post transaction'
|
||||
disabled={ sending }
|
||||
icon={ <IdentityIcon address={ fromAddress } button /> }
|
||||
onClick={ this.postTransaction } />
|
||||
];
|
||||
} else if (step === 1) {
|
||||
return [
|
||||
cancelBtn
|
||||
];
|
||||
}
|
||||
|
||||
return [
|
||||
<Button
|
||||
key='close'
|
||||
label='Done'
|
||||
icon={ <ActionDoneAll /> }
|
||||
onClick={ onClose } />
|
||||
];
|
||||
}
|
||||
|
||||
renderStep () {
|
||||
const { onFromAddressChange } = this.props;
|
||||
const { step, busyState, txhash } = this.state;
|
||||
|
||||
if (step === 0) {
|
||||
return (
|
||||
<DetailsStep
|
||||
{ ...this.props }
|
||||
{ ...this.state }
|
||||
onAmountChange={ this.onAmountChange }
|
||||
onFromAddressChange={ onFromAddressChange }
|
||||
onFuncChange={ this.onFuncChange }
|
||||
onValueChange={ this.onValueChange } />
|
||||
);
|
||||
} else if (step === 1) {
|
||||
return (
|
||||
<BusyStep
|
||||
title='The function execution is in progress'
|
||||
state={ busyState } />
|
||||
);
|
||||
}
|
||||
|
||||
return (
|
||||
<CompletedStep>
|
||||
<TxHash hash={ txhash } />
|
||||
</CompletedStep>
|
||||
);
|
||||
}
|
||||
|
||||
onAmountChange = (amount) => {
|
||||
this.setState({ amount });
|
||||
}
|
||||
|
||||
onFuncChange = (event, func) => {
|
||||
const values = func.inputs.map((input) => {
|
||||
switch (input.kind.type) {
|
||||
case 'address':
|
||||
return '0x';
|
||||
|
||||
case 'bytes':
|
||||
return '0x';
|
||||
|
||||
case 'uint':
|
||||
return '0';
|
||||
|
||||
default:
|
||||
return '';
|
||||
}
|
||||
});
|
||||
|
||||
this.setState({
|
||||
func,
|
||||
values
|
||||
});
|
||||
}
|
||||
|
||||
onValueChange = (event, index, _value) => {
|
||||
const { func, values, valuesError } = this.state;
|
||||
const input = func.inputs.find((input, _index) => index === _index);
|
||||
let value;
|
||||
let valueError;
|
||||
|
||||
switch (input.kind.type) {
|
||||
default:
|
||||
value = _value;
|
||||
valueError = null;
|
||||
break;
|
||||
}
|
||||
|
||||
values[index] = value;
|
||||
valuesError[index] = valueError;
|
||||
|
||||
this.setState({
|
||||
values,
|
||||
valuesError
|
||||
});
|
||||
}
|
||||
|
||||
postTransaction = () => {
|
||||
const { api, store } = this.context;
|
||||
const { fromAddress } = this.props;
|
||||
const { amount, func, values } = this.state;
|
||||
const options = {
|
||||
from: fromAddress,
|
||||
value: api.util.toWei(amount || 0)
|
||||
};
|
||||
|
||||
this.setState({ sending: true, step: 1 });
|
||||
|
||||
func
|
||||
.estimateGas(options, values)
|
||||
.then((gas) => {
|
||||
options.gas = gas.mul(1.2).toFixed(0);
|
||||
console.log(`estimateGas: received ${gas.toFormat(0)}, adjusted to ${gas.mul(1.2).toFormat(0)}`);
|
||||
return func.postTransaction(options, values);
|
||||
})
|
||||
.then((requestId) => {
|
||||
this.setState({ busyState: 'Waiting for authorization in the Parity Signer' });
|
||||
return api.pollMethod('eth_checkRequest', requestId);
|
||||
})
|
||||
.then((txhash) => {
|
||||
this.setState({ sending: false, step: 2, txhash, busyState: 'Your transaction has been posted to the network' });
|
||||
})
|
||||
.catch((error) => {
|
||||
console.error('postTransaction', error);
|
||||
store.dispatch({ type: 'newError', error });
|
||||
});
|
||||
}
|
||||
}
|
||||
17
js/src/modals/ExecuteContract/index.js
Normal file
17
js/src/modals/ExecuteContract/index.js
Normal file
@@ -0,0 +1,17 @@
|
||||
// Copyright 2015, 2016 Ethcore (UK) Ltd.
|
||||
// This file is part of Parity.
|
||||
|
||||
// Parity is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
|
||||
// Parity is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
export default from './executeContract';
|
||||
Reference in New Issue
Block a user