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

Merge remote-tracking branch 'origin/master' into check-updates

Browse Source
This commit is contained in:
Gav Wood 2016-12-15 21:15:25 +01:00
commit 5bab14e0c0
No known key found for this signature in database
GPG Key ID: C49C1ACA1CC9B252
5 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Cargo.lock generated
View File

@ -1379,7 +1379,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#ad6617a73dbb17c53dddc0fc567e70ea5b8e882f" source = "git+https://github.com/ethcore/js-precompiled.git#2d07c405453bcf1e603c3965387b7f920565b6d8"
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)",
] ]
@ -1409,6 +1409,17 @@ dependencies = [
"winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]]
name = "parking_lot"
version = "0.2.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)",
"smallvec 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
"winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]] [[package]]
name = "parking_lot" name = "parking_lot"
version = "0.3.6" version = "0.3.6"

2
js/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "parity.js", "name": "parity.js",
"version": "0.2.125", "version": "0.2.126",
"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>",

4
js/src/modals/Verification/email-store.js
View File

@ -23,6 +23,8 @@ import VerificationStore, {
} from './store'; } from './store';
import { postToServer } from '../../3rdparty/email-verification'; import { postToServer } from '../../3rdparty/email-verification';
const EMAIL_VERIFICATION = 4; // id in the `BadgeReg.sol` contract
export default class EmailVerificationStore extends VerificationStore { export default class EmailVerificationStore extends VerificationStore {
@observable email = ''; @observable email = '';
@ -54,7 +56,7 @@ export default class EmailVerificationStore extends VerificationStore {
} }
constructor (api, account, isTestnet) { constructor (api, account, isTestnet) {
super(api, EmailVerificationABI, 'emailverification3', account, isTestnet); super(api, EmailVerificationABI, EMAIL_VERIFICATION, account, isTestnet);
} }
requestValues = () => [ sha3(this.email) ] requestValues = () => [ sha3(this.email) ]

4
js/src/modals/Verification/sms-store.js
View File

@ -23,6 +23,8 @@ import VerificationStore, {
} from './store'; } from './store';
import { postToServer } from '../../3rdparty/sms-verification'; import { postToServer } from '../../3rdparty/sms-verification';
const SMS_VERIFICATION = 0; // id in the `BadgeReg.sol` contract
export default class SMSVerificationStore extends VerificationStore { export default class SMSVerificationStore extends VerificationStore {
@observable number = ''; @observable number = '';
@ -53,7 +55,7 @@ export default class SMSVerificationStore extends VerificationStore {
} }
constructor (api, account, isTestnet) { constructor (api, account, isTestnet) {
super(api, SMSVerificationABI, 'smsverification', account, isTestnet); super(api, SMSVerificationABI, SMS_VERIFICATION, account, isTestnet);
} }
@action setNumber = (number) => { @action setNumber = (number) => {

4
js/src/modals/Verification/store.js
View File

@ -46,13 +46,13 @@ export default class VerificationStore {
@observable isCodeValid = null; @observable isCodeValid = null;
@observable confirmationTx = null; @observable confirmationTx = null;
constructor (api, abi, name, account, isTestnet) { constructor (api, abi, certifierId, account, isTestnet) {
this.api = api; this.api = api;
this.account = account; this.account = account;
this.isTestnet = isTestnet; this.isTestnet = isTestnet;
this.step = LOADING; this.step = LOADING;
Contracts.get().badgeReg.fetchCertifier(name) Contracts.get().badgeReg.fetchCertifier(certifierId)
.then(({ address }) => { .then(({ address }) => {
this.contract = new Contract(api, abi).at(address); this.contract = new Contract(api, abi).at(address);
this.load(); this.load();