From 0e963da27b3389d1d3b27d5daf47cefb4cb1a584 Mon Sep 17 00:00:00 2001 From: Jannis R Date: Thu, 15 Dec 2016 18:09:52 +0100 Subject: [PATCH 1/3] fix verification stores :bug: --- js/src/modals/Verification/email-store.js | 2 +- js/src/modals/Verification/sms-store.js | 2 +- js/src/modals/Verification/store.js | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/js/src/modals/Verification/email-store.js b/js/src/modals/Verification/email-store.js index 3d7faa9e1..7855732c7 100644 --- a/js/src/modals/Verification/email-store.js +++ b/js/src/modals/Verification/email-store.js @@ -54,7 +54,7 @@ export default class EmailVerificationStore extends VerificationStore { } constructor (api, account, isTestnet) { - super(api, EmailVerificationABI, 'emailverification3', account, isTestnet); + super(api, EmailVerificationABI, 4, 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..84a445452 100644 --- a/js/src/modals/Verification/sms-store.js +++ b/js/src/modals/Verification/sms-store.js @@ -53,7 +53,7 @@ export default class SMSVerificationStore extends VerificationStore { } constructor (api, account, isTestnet) { - super(api, SMSVerificationABI, 'smsverification', account, isTestnet); + super(api, SMSVerificationABI, 0, 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(); From 867fdb9eac86f1d782624831e64a5523309258c4 Mon Sep 17 00:00:00 2001 From: GitLab Build Bot Date: Thu, 15 Dec 2016 17:23:53 +0000 Subject: [PATCH 2/3] [ci skip] js-precompiled 20161215-172100 --- Cargo.lock | 17 +++++++++++++++-- js/package.json | 2 +- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 86a49298b..9a6ed9be6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -886,7 +886,7 @@ version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "parking_lot 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", + "parking_lot 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.8.4 (registry+https://github.com/rust-lang/crates.io-index)", "serde_codegen 0.8.4 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1363,11 +1363,22 @@ 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)", ] +[[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" @@ -1620,6 +1631,7 @@ 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)", "termios 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2218,6 +2230,7 @@ dependencies = [ "checksum owning_ref 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8d91377085359426407a287ab16884a0111ba473aa6844ff01d4ec20ce3d75e7" "checksum parity-dapps-glue 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "98378dec0a185da2b7180308752f0bad73aaa949c3e0a3b0528d0e067945f7ab" "checksum parity-ui-precompiled 1.4.0 (git+https://github.com/ethcore/js-precompiled.git)" = "" +"checksum parking_lot 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "968f685642555d2f7e202c48b8b11de80569e9bfea817f7f12d7c61aac62d4e6" "checksum parking_lot 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "e1435e7a2a00dfebededd6c6bdbd54008001e94b4a2aadd6aef0dc4c56317621" "checksum parking_lot_core 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fb1b97670a2ffadce7c397fb80a3d687c4f3060140b885621ef1653d0e5d5068" "checksum phf 0.7.14 (registry+https://github.com/rust-lang/crates.io-index)" = "447d9d45f2e0b4a9b532e808365abf18fc211be6ca217202fcd45236ef12f026" diff --git a/js/package.json b/js/package.json index 66a60385b..d247714ab 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 ", From d2962fe47b52777a42f4d48967b3cfaa9e451b20 Mon Sep 17 00:00:00 2001 From: Jannis R Date: Thu, 15 Dec 2016 20:45:49 +0100 Subject: [PATCH 3/3] store certifier index in constant --- js/src/modals/Verification/email-store.js | 4 +++- js/src/modals/Verification/sms-store.js | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/js/src/modals/Verification/email-store.js b/js/src/modals/Verification/email-store.js index 7855732c7..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, 4, 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 84a445452..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, 0, account, isTestnet); + super(api, SMSVerificationABI, SMS_VERIFICATION, account, isTestnet); } @action setNumber = (number) => {