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

Merge branch 'master' into ui-2

Browse Source 
# Conflicts:
#	js/src/ui/Balance/balance.js
This commit is contained in:
Jaco Greeff 2017-06-08 11:51:46 +02:00
commit c1599a3d85
8 changed files with 81 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
.gitlab-ci.yml
View File

@ -69,17 +69,29 @@ linux-snap:
- tags
- triggers
script:
- rm -rf *snap
- export VER=$(grep -m 1 version Cargo.toml | awk '{print $3}' | tr -d '"' | tr -d "\n")
- cd scripts
- rm -rf *snap
- sed -i 's/master/'"$VER"'/g' snapcraft.yaml
- echo "Version:"$VER
- snapcraft
- ls
- cp parity_master_amd64.snap parity_"$VER"_amd64.snap
- md5sum "parity_"$VER"_amd64.snap" > "parity_"$VER"_amd64.snap.md5"
- aws configure set aws_access_key_id $s3_key
- aws configure set aws_secret_access_key $s3_secret
- if [[ $CI_BUILD_REF_NAME =~ ^(master|beta|stable|nightly)$ ]]; then export S3_BUCKET=builds-parity-published; else export S3_BUCKET=builds-parity; fi
- aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/x86_64-unknown-linux-gnu/"parity_"$VER"_amd64.snap" --body "parity_"$VER"_amd64.snap"
- aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/x86_64-unknown-linux-gnu/"parity_"$VER"_amd64.snap.md5" --body "parity_"$VER"_amd64.snap.md5"
- curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1337/push-build/$CI_BUILD_REF_NAME/x86_64-unknown-linux-gnu
- curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1338/push-build/$CI_BUILD_REF_NAME/x86_64-unknown-linux-gnu
tags:
- rust
- rust-stable
artifacts:
paths:
- scripts/parity_master_amd64.snap
name: "stable-x86_64-unknown-linux-gnu_parity-snap"
allow_failure: true
- scripts/parity_*_amd64.snap
name: "stable-x86_64-unknown-snap-gnu_parity"
linux-stable-debian:
stage: build
image: parity/rust-debian:gitlab-ci

2
js/src/ui/Balance/balance.js
View File

@ -35,7 +35,7 @@ function Balance ({ balance, className, showOnlyEth, tokens }) {
const isEthToken = token.native;
const isFullToken = !showOnlyEth || isEthToken;
const hasBalance = balanceValue.gt(0);
const hasBalance = (balanceValue instanceof BigNumber) && balanceValue.gt(0);
if (!hasBalance && !isEthToken) {
return null;

4
js/src/views/Accounts/CreateAccount/createAccount.js
View File

@ -329,17 +329,13 @@ class CreateAccount extends Component {
}
onCreate = () => {
this.createStore.setBusy(true);
return this.createStore
.createAccount(this.vaultStore)
.then(() => {
this.createStore.setBusy(false);
this.createStore.nextStage();
this.props.onUpdate && this.props.onUpdate();
})
.catch((error) => {
this.createStore.setBusy(false);
this.props.newError(error);
});
}

4
js/src/views/Accounts/CreateAccount/createAccount.test.js
View File

@ -17,6 +17,7 @@
import BigNumber from 'bignumber.js';
import sinon from 'sinon';
import Api from '~/api';
import Store from './store';
const ADDRESS = '0x00000123456789abcdef123456789abcdef123456789abcdef';
@ -45,7 +46,8 @@ function createApi () {
setAccountName: sinon.stub().resolves(),
listVaults: sinon.stub().resolves([]),
listOpenedVaults: sinon.stub().resolves([])
}
},
util: Api.util
};
}

16
js/src/views/Accounts/CreateAccount/store.js
View File

@ -70,7 +70,7 @@ export default class Store {
return !(this.nameError || this.walletFileError);
case 'fromNew':
return !(this.nameError || this.passwordRepeatError) && this.hasAddress;
return !(this.nameError || this.passwordRepeatError) && this.hasAddress && this.hasPhrase;
case 'fromPhrase':
return !(this.nameError || this.passwordRepeatError || this.passPhraseError);
@ -94,6 +94,10 @@ export default class Store {
return !!(this.address);
}
@computed get hasPhrase () {
return this.phrase.length !== 0;
}
@computed get passwordRepeatError () {
return this.password === this.passwordRepeat
? null
@ -112,7 +116,7 @@ export default class Store {
this.passwordRepeat = '';
this.phrase = '';
this.name = '';
this.nameError = null;
this.nameError = ERRORS.noName;
this.qrAddress = null;
this.rawKey = '';
this.rawKeyError = null;
@ -250,6 +254,10 @@ export default class Store {
}
@action nextStage = () => {
if (this.stage === 0) {
this.clearErrors();
}
this.stage++;
}
@ -258,6 +266,10 @@ export default class Store {
}
createAccount = (vaultStore) => {
if (!this.canCreate) {
return false;
}
this.setBusy(true);
return this

57
js/src/views/Accounts/CreateAccount/store.spec.js
View File

@ -90,7 +90,7 @@ describe('modals/CreateAccount/Store', () => {
store.clearErrors();
expect(store.name).to.equal('');
expect(store.nameError).to.be.null;
expect(store.nameError).not.to.be.null;
expect(store.password).to.equal('');
expect(store.passwordRepeatError).to.be.null;
expect(store.qrAddress).to.be.null;
@ -309,6 +309,7 @@ describe('modals/CreateAccount/Store', () => {
describe('createType === fromJSON/fromPresale', () => {
beforeEach(() => {
store.setCreateType('fromJSON');
store.setName('blah');
});
it('returns true on no errors', () => {
@ -330,6 +331,8 @@ describe('modals/CreateAccount/Store', () => {
beforeEach(() => {
store.setCreateType('fromNew');
store.setAddress('0x0000000000000000000000000000000000000000');
store.setName('blah');
store.setPhrase('testing');
});
it('returns true on no errors', () => {
@ -342,6 +345,12 @@ describe('modals/CreateAccount/Store', () => {
expect(store.canCreate).to.be.false;
});
it('returns false on no phrase', () => {
store.setPhrase('');
expect(store.canCreate).to.be.false;
});
it('returns false on passwordRepeatError', () => {
store.setPassword('testing');
@ -352,6 +361,7 @@ describe('modals/CreateAccount/Store', () => {
describe('createType === fromPhrase', () => {
beforeEach(() => {
store.setCreateType('fromPhrase');
store.setName('name');
});
it('returns true on no errors', () => {
@ -372,6 +382,8 @@ describe('modals/CreateAccount/Store', () => {
describe('createType === fromRaw', () => {
beforeEach(() => {
store.setCreateType('fromRaw');
store.setName('name');
store.setRawKey('0x1000000000000000000000000000000000000000000000000000000000000000');
});
it('returns true on no errors', () => {
@ -389,7 +401,7 @@ describe('modals/CreateAccount/Store', () => {
});
it('returns false on rawKeyError', () => {
store.setRawKey('testing');
store.setRawKey('0x1');
expect(store.canCreate).to.be.false;
});
});
@ -459,6 +471,9 @@ describe('modals/CreateAccount/Store', () => {
createAccountFromQrSpy = sinon.spy(store, 'createAccountFromQr');
createAccountFromRawSpy = sinon.spy(store, 'createAccountFromRaw');
busySpy = sinon.spy(store, 'setBusy');
store.setName('name');
store.setPhrase('testing');
});
afterEach(() => {
@ -477,6 +492,8 @@ describe('modals/CreateAccount/Store', () => {
it('calls createAccountFromGeth on createType === fromGeth', () => {
store.setCreateType('fromGeth');
store.setGethAccountsAvailable(GETH_ADDRESSES);
store.selectGethAccount(GETH_ADDRESSES[0]);
return store.createAccount().then(() => {
expect(createAccountFromGethSpy).to.have.been.called;
@ -485,6 +502,8 @@ describe('modals/CreateAccount/Store', () => {
it('calls createAccountFromWallet on createType === fromJSON', () => {
store.setCreateType('fromJSON');
store.setName('name');
store.setWalletJson('{}');
return store.createAccount().then(() => {
expect(createAccountFromWalletSpy).to.have.been.called;
@ -493,6 +512,9 @@ describe('modals/CreateAccount/Store', () => {
it('calls createAccountFromPhrase on createType === fromNew', () => {
store.setCreateType('fromNew');
store.setName('name');
store.setPhrase('phrase');
store.setAddress('0x1234567890123456789012345678901234567890');
return store.createAccount().then(() => {
expect(createAccountFromPhraseSpy).to.have.been.called;
@ -501,6 +523,9 @@ describe('modals/CreateAccount/Store', () => {
it('calls createAccountFromPhrase on createType === fromPhrase', () => {
store.setCreateType('fromPhrase');
store.setName('name');
store.setPhrase('phrase');
store.setAddress('0x1234567890123456789012345678901234567890');
return store.createAccount().then(() => {
expect(createAccountFromPhraseSpy).to.have.been.called;
@ -509,6 +534,8 @@ describe('modals/CreateAccount/Store', () => {
it('calls createAccountFromWallet on createType === fromPresale', () => {
store.setCreateType('fromPresale');
store.setName('name');
store.setWalletJson('{}');
return store.createAccount().then(() => {
expect(createAccountFromWalletSpy).to.have.been.called;
@ -517,6 +544,8 @@ describe('modals/CreateAccount/Store', () => {
it('calls createAccountFromQr on createType === fromQr', () => {
store.setCreateType('fromQr');
store.setQrAddress('0x1234567890123456789012345678901234567890');
store.setName('name');
return store.createAccount().then(() => {
expect(createAccountFromQrSpy).to.have.been.called;
@ -525,6 +554,8 @@ describe('modals/CreateAccount/Store', () => {
it('calls createAccountFromRaw on createType === fromRaw', () => {
store.setCreateType('fromRaw');
store.setName('name');
store.setRawKey('0x1000000000000000000000000000000000000000000000000000000000000000');
return store.createAccount().then(() => {
expect(createAccountFromRawSpy).to.have.been.called;
@ -534,6 +565,9 @@ describe('modals/CreateAccount/Store', () => {
it('moves account to vault when vaultName set', () => {
store.setCreateType('fromNew');
store.setVaultName('testing');
store.setName('name');
store.setAddress('0x1234567890123456789012345678901234567890');
store.setPhrase('phrase');
return store.createAccount(vaultStore).then(() => {
expect(vaultStore.moveAccount).to.have.been.calledWith('testing', ADDRESS);
@ -542,6 +576,9 @@ describe('modals/CreateAccount/Store', () => {
it('sets and rests the busy flag', () => {
store.setCreateType('fromNew');
store.setName('name');
store.setAddress('0x1234567890123456789012345678901234567890');
store.setPhrase('phrase');
return store.createAccount().then(() => {
expect(busySpy).to.have.been.calledWith(true);
@ -634,22 +671,18 @@ describe('modals/CreateAccount/Store', () => {
beforeEach(() => {
store.setName('some name');
store.setDescription('some desc');
store.setQrAddress('0x123');
store.setQrAddress('0x1234567890123456789012345678901234567890');
sinon.spy(store, 'setupMeta');
return store.createAccountFromQr(-1);
});
it('sets the accountInfo name', () => {
expect(api.parity.setAccountName).to.have.been.calledWith('0x123', 'some name');
afterEach(() => {
store.setupMeta.restore();
});
it('sets the meta (with extrenal flag)', () => {
expect(api.parity.setAccountMeta).to.have.been.calledWith('0x123', {
description: 'some desc',
passwordHint: '',
timestamp: -1,
external: true
});
it('sets the meta', () => {
expect(store.setupMeta).to.have.been.called;
});
});

2
mac/post-install.sh
View File

@ -4,5 +4,5 @@ test -f /usr/local/libexec/uninstall-parity.sh && /usr/local/libexec/uninstall-p
killall -9 parity && sleep 5
su $USER -c "open /Applications/Parity\ Ethereum.app"
sleep 5
su $USER -c "open http://127.0.0.1:8080/"
su $USER -c "open http://127.0.0.1:8180/"
exit 0

2
snap/snapcraft.yaml
View File

@ -17,6 +17,6 @@ apps:
parts:
parity:
source: ..
source: .
plugin: rust
build-packages: [g++, libudev-dev, libssl-dev, make, pkg-config]