diff --git a/Cargo.lock b/Cargo.lock index 847e36134..6b402ae78 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1379,7 +1379,7 @@ dependencies = [ [[package]] name = "parity-ui-precompiled" 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 = [ "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)", ] +[[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]] name = "parking_lot" version = "0.3.6" diff --git a/js/package.json b/js/package.json index 009795973..a36488921 100644 --- a/js/package.json +++ b/js/package.json @@ -1,6 +1,6 @@ { "name": "parity.js", - "version": "0.2.125", + "version": "0.2.126", "main": "release/index.js", "jsnext:main": "src/index.js", "author": "Parity Team ", diff --git a/js/src/modals/Verification/email-store.js b/js/src/modals/Verification/email-store.js index 3d7faa9e1..a86f9e4b1 100644 --- a/js/src/modals/Verification/email-store.js +++ b/js/src/modals/Verification/email-store.js @@ -23,6 +23,8 @@ import VerificationStore, { } from './store'; import { postToServer } from '../../3rdparty/email-verification'; +const EMAIL_VERIFICATION = 4; // id in the `BadgeReg.sol` contract + export default class EmailVerificationStore extends VerificationStore { @observable email = ''; @@ -54,7 +56,7 @@ export default class EmailVerificationStore extends VerificationStore { } constructor (api, account, isTestnet) { - super(api, EmailVerificationABI, 'emailverification3', account, isTestnet); + super(api, EmailVerificationABI, EMAIL_VERIFICATION, account, isTestnet); } requestValues = () => [ sha3(this.email) ] diff --git a/js/src/modals/Verification/sms-store.js b/js/src/modals/Verification/sms-store.js index 44c5aa39c..3c58b6ef9 100644 --- a/js/src/modals/Verification/sms-store.js +++ b/js/src/modals/Verification/sms-store.js @@ -23,6 +23,8 @@ import VerificationStore, { } from './store'; import { postToServer } from '../../3rdparty/sms-verification'; +const SMS_VERIFICATION = 0; // id in the `BadgeReg.sol` contract + export default class SMSVerificationStore extends VerificationStore { @observable number = ''; @@ -53,7 +55,7 @@ export default class SMSVerificationStore extends VerificationStore { } constructor (api, account, isTestnet) { - super(api, SMSVerificationABI, 'smsverification', account, isTestnet); + super(api, SMSVerificationABI, SMS_VERIFICATION, account, isTestnet); } @action setNumber = (number) => { diff --git a/js/src/modals/Verification/store.js b/js/src/modals/Verification/store.js index dcbfbf698..692fc58a3 100644 --- a/js/src/modals/Verification/store.js +++ b/js/src/modals/Verification/store.js @@ -46,13 +46,13 @@ export default class VerificationStore { @observable isCodeValid = null; @observable confirmationTx = null; - constructor (api, abi, name, account, isTestnet) { + constructor (api, abi, certifierId, account, isTestnet) { this.api = api; this.account = account; this.isTestnet = isTestnet; this.step = LOADING; - Contracts.get().badgeReg.fetchCertifier(name) + Contracts.get().badgeReg.fetchCertifier(certifierId) .then(({ address }) => { this.contract = new Contract(api, abi).at(address); this.load();