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

Merge branch 'master' into auth-round

Browse Source
This commit is contained in:
keorn 2016-11-04 13:47:29 +00:00
commit 9de910cf9c
5 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.lock generated
View File

@ -1249,7 +1249,7 @@ dependencies = [
[[package]] [[package]]
name = "parity-ui-precompiled" name = "parity-ui-precompiled"
version = "1.4.0" version = "1.4.0"
source = "git+https://github.com/ethcore/js-precompiled.git#3a77750a2d29e2babb52bc4dfa5c40b2e26b97ce" source = "git+https://github.com/ethcore/js-precompiled.git#cb99e22b536486190f3e19b2760e1142096b5fd7"
dependencies = [ dependencies = [
"parity-dapps-glue 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "parity-dapps-glue 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
] ]

2
js/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "parity.js", "name": "parity.js",
"version": "0.1.61", "version": "0.1.63",
"main": "release/index.js", "main": "release/index.js",
"jsnext:main": "src/index.js", "jsnext:main": "src/index.js",
"author": "Parity Team <admin@parity.io>", "author": "Parity Team <admin@parity.io>",

3
js/scripts/release.sh
View File

@ -57,7 +57,6 @@ if [ "$BRANCH" == "master" ]; then
npm version patch npm version patch
echo "*** Building packages for npmjs" echo "*** Building packages for npmjs"
cd js
# echo -e "$NPM_USERNAME\n$NPM_PASSWORD\n$NPM_EMAIL" | npm login # echo -e "$NPM_USERNAME\n$NPM_PASSWORD\n$NPM_EMAIL" | npm login
echo "$NPM_TOKEN" >> ~/.npmrc echo "$NPM_TOKEN" >> ~/.npmrc
npm run ci:build:npm npm run ci:build:npm
@ -65,7 +64,7 @@ if [ "$BRANCH" == "master" ]; then
echo "*** Publishing $PACKAGE to npmjs" echo "*** Publishing $PACKAGE to npmjs"
cd .npmjs cd .npmjs
npm publish --access public npm publish --access public
cd .. cd ../..
fi fi
echo "*** Updating cargo parity-ui-precompiled#$PRECOMPILED_HASH" echo "*** Updating cargo parity-ui-precompiled#$PRECOMPILED_HASH"

6
js/src/modals/Transfer/GasPriceSelector/gasPriceSelector.js
View File

@ -539,7 +539,7 @@ export default class GasPriceSelector extends Component {
const gasPriceBIdx = gasPriceAIdx + 1; const gasPriceBIdx = gasPriceAIdx + 1;
if (gasPriceBIdx === N + 1) { if (gasPriceBIdx === N + 1) {
const gasPrice = gasPrices[gasPriceAIdx]; const gasPrice = gasPrices[gasPriceAIdx].round();
this.props.onChange(event, gasPrice); this.props.onChange(event, gasPrice);
return; return;
} }
@ -548,7 +548,9 @@ export default class GasPriceSelector extends Component {
const gasPriceB = gasPrices[gasPriceBIdx]; const gasPriceB = gasPrices[gasPriceBIdx];
const mult = Math.round((sliderValue % 1) * 100) / 100; const mult = Math.round((sliderValue % 1) * 100) / 100;
const gasPrice = gasPriceA.plus(gasPriceB.minus(gasPriceA).times(mult)); const gasPrice = gasPriceA
.plus(gasPriceB.minus(gasPriceA).times(mult))
.round();
this.setSliderValue(sliderValue, gasPrice); this.setSliderValue(sliderValue, gasPrice);
this.props.onChange(event, gasPrice); this.props.onChange(event, gasPrice);

1
js/src/modals/Transfer/transfer.js
View File

@ -411,6 +411,7 @@ export default class Transfer extends Component {
const { api } = this.context; const { api } = this.context;
const { account } = this.props; const { account } = this.props;
const { data, gas, gasPrice, recipient, value } = this.state; const { data, gas, gasPrice, recipient, value } = this.state;
const options = { const options = {
from: account.address, from: account.address,
to: recipient, to: recipient,