From 7cb724bfbe8cad88cfb0cbb5cac006e4535eeaa6 Mon Sep 17 00:00:00 2001
From: Jannis R <mail@jannisr.de>
Date: Thu, 3 Nov 2016 17:47:27 +0100
Subject: [PATCH 01/57] put SMS verification into action bar

---
 js/src/modals/index.js          |  2 ++
 js/src/views/Account/account.js | 31 ++++++++++++++++++++++++++++++-
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/js/src/modals/index.js b/js/src/modals/index.js
index 0e8c33563..1979fb088 100644
--- a/js/src/modals/index.js
+++ b/js/src/modals/index.js
@@ -22,6 +22,7 @@ import EditMeta from './EditMeta';
 import ExecuteContract from './ExecuteContract';
 import FirstRun from './FirstRun';
 import Shapeshift from './Shapeshift';
+import SMSVerification from './SMSVerification';
 import Transfer from './Transfer';
 import PasswordManager from './PasswordManager';
 
@@ -34,6 +35,7 @@ export {
   ExecuteContract,
   FirstRun,
   Shapeshift,
+  SMSVerification,
   Transfer,
   PasswordManager
 };
diff --git a/js/src/views/Account/account.js b/js/src/views/Account/account.js
index 902e3e7c1..2e0759242 100644
--- a/js/src/views/Account/account.js
+++ b/js/src/views/Account/account.js
@@ -20,8 +20,9 @@ import { bindActionCreators } from 'redux';
 import ContentCreate from 'material-ui/svg-icons/content/create';
 import ContentSend from 'material-ui/svg-icons/content/send';
 import LockIcon from 'material-ui/svg-icons/action/lock';
+import VerifyIcon from 'material-ui/svg-icons/action/verified-user';
 
-import { EditMeta, Shapeshift, Transfer, PasswordManager } from '../../modals';
+import { EditMeta, Shapeshift, SMSVerification, Transfer, PasswordManager } from '../../modals';
 import { Actionbar, Button, Page } from '../../ui';
 
 import shapeshiftBtn from '../../../assets/images/shapeshift-btn.png';
@@ -45,6 +46,7 @@ class Account extends Component {
   state = {
     showEditDialog: false,
     showFundDialog: false,
+    showVerificationDialog: false,
     showTransferDialog: false,
     showPasswordDialog: false
   }
@@ -64,6 +66,7 @@ class Account extends Component {
       <div className={ styles.account }>
         { this.renderEditDialog(account) }
         { this.renderFundDialog() }
+        { this.renderVerificationDialog() }
         { this.renderTransferDialog() }
         { this.renderPasswordDialog() }
         { this.renderActionbar() }
@@ -99,6 +102,11 @@ class Account extends Component {
         icon={ <img src={ shapeshiftBtn } className={ styles.btnicon } /> }
         label='shapeshift'
         onClick={ this.onShapeshiftAccountClick } />,
+      <Button
+        key='sms-verification'
+        icon={ <VerifyIcon /> }
+        label='Verify via SMS'
+        onClick={ this.openVerification } />,
       <Button
         key='editmeta'
         icon={ <ContentCreate /> }
@@ -149,6 +157,19 @@ class Account extends Component {
     );
   }
 
+  renderVerificationDialog () {
+    if (!this.state.showVerificationDialog) {
+      return null;
+    }
+
+    const { address } = this.props.params;
+
+    // TODO: pass props
+    return (
+      <SMSVerification onClose={ this.onVerificationClose } />
+    );
+  }
+
   renderTransferDialog () {
     const { showTransferDialog } = this.state;
 
@@ -205,6 +226,14 @@ class Account extends Component {
     this.onShapeshiftAccountClick();
   }
 
+  openVerification = () => {
+    this.setState({ showVerificationDialog: true });
+  }
+
+  onVerificationClose = () => {
+    this.setState({ showVerificationDialog: false });
+  }
+
   onTransferClick = () => {
     this.setState({
       showTransferDialog: !this.state.showTransferDialog

From f96e69309f78e2f5f9429e5cc78dcd4333a17524 Mon Sep 17 00:00:00 2001
From: Jannis R <mail@jannisr.de>
Date: Thu, 3 Nov 2016 18:01:24 +0100
Subject: [PATCH 02/57] SMS verification modal

---
 .../modals/SMSVerification/SMSVerification.js | 89 +++++++++++++++++++
 js/src/modals/SMSVerification/index.js        | 17 ++++
 2 files changed, 106 insertions(+)
 create mode 100644 js/src/modals/SMSVerification/SMSVerification.js
 create mode 100644 js/src/modals/SMSVerification/index.js

diff --git a/js/src/modals/SMSVerification/SMSVerification.js b/js/src/modals/SMSVerification/SMSVerification.js
new file mode 100644
index 000000000..d68b25291
--- /dev/null
+++ b/js/src/modals/SMSVerification/SMSVerification.js
@@ -0,0 +1,89 @@
+// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+import React, { Component, PropTypes } from 'react';
+import ActionDoneAll from 'material-ui/svg-icons/action/done-all';
+import ContentClear from 'material-ui/svg-icons/content/clear';
+
+import { BusyStep, CompletedStep, Button, IdentityIcon, Modal } from '../../ui';
+import { validateAddress, validateUint } from '../../util/validation';
+
+import ABI from '../../contracts/abi/sms-verification.json';
+const contract = '0x7B3F58965439b22ef1dA4BB78f16191d11ab80B0';
+
+// import DetailsStep from './DetailsStep';
+
+export default class SMSVerification extends Component {
+  static contextTypes = {
+    api: PropTypes.object.isRequired,
+    // store: PropTypes.object.isRequired
+  }
+
+  static propTypes = {
+    isTest: PropTypes.bool,
+    account: PropTypes.string,
+    onClose: PropTypes.func.isRequired
+  }
+
+  state = {
+    contract: null,
+    step: 0,
+    number: null,
+    numberError: null
+  }
+
+  componentDidMount () {
+    const { api } = this.context;
+
+    this.setState({
+      contract: api.newContract(ABI, contract)
+    });
+  }
+
+  render () {
+    return (
+      <Modal
+        actions={ this.renderDialogActions() }
+        title='verify your account via SMS'
+        waiting={ [4] }
+        visible scroll
+      >
+        <span>foo</span>
+      </Modal>
+    );
+  }
+
+  renderDialogActions () {
+    const { onClose, account } = this.props;
+
+    return (
+      <div>
+        <Button
+          key='cancel'
+          label='Cancel'
+          icon={ <ContentClear /> }
+          onClick={ onClose }
+        />
+        <Button
+          key='close'
+          label='Done'
+          icon={ <ActionDoneAll /> }
+          onClick={ onClose }
+        />
+      </div>
+    );
+  }
+}
diff --git a/js/src/modals/SMSVerification/index.js b/js/src/modals/SMSVerification/index.js
new file mode 100644
index 000000000..d9b0990db
--- /dev/null
+++ b/js/src/modals/SMSVerification/index.js
@@ -0,0 +1,17 @@
+// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+export default from './SMSVerification';

From fc76fa9252b7741c4c3e1e2eeebbf5f4fc578424 Mon Sep 17 00:00:00 2001
From: Jannis R <mail@jannisr.de>
Date: Thu, 3 Nov 2016 18:13:45 +0100
Subject: [PATCH 03/57] sms verification: basic stepper

---
 .../modals/SMSVerification/SMSVerification.js | 71 +++++++++++++++----
 js/src/views/Account/account.js               |  5 +-
 2 files changed, 62 insertions(+), 14 deletions(-)

diff --git a/js/src/modals/SMSVerification/SMSVerification.js b/js/src/modals/SMSVerification/SMSVerification.js
index d68b25291..75330bd21 100644
--- a/js/src/modals/SMSVerification/SMSVerification.js
+++ b/js/src/modals/SMSVerification/SMSVerification.js
@@ -33,7 +33,6 @@ export default class SMSVerification extends Component {
   }
 
   static propTypes = {
-    isTest: PropTypes.bool,
     account: PropTypes.string,
     onClose: PropTypes.func.isRequired
   }
@@ -54,36 +53,82 @@ export default class SMSVerification extends Component {
   }
 
   render () {
+    const { step } = this.state;
+
     return (
       <Modal
         actions={ this.renderDialogActions() }
         title='verify your account via SMS'
-        waiting={ [4] }
         visible scroll
+        current={ step }
+        steps={ ['first step', 'second step'] }
       >
-        <span>foo</span>
+        { this.renderStep() }
       </Modal>
     );
   }
 
   renderDialogActions () {
     const { onClose, account } = this.props;
+    const { step } = this.state;
+
+    const cancel = (
+      <Button
+        key='cancel' label='Cancel'
+        icon={ <ContentClear /> }
+        onClick={ onClose }
+      />
+    );
+
+    if (step === 1) {
+      return (
+        <div>
+          { cancel }
+          <Button
+            key='done' label='Done'
+            icon={ <ActionDoneAll /> }
+            onClick={ onClose }
+          />
+        </div>
+      );
+    }
 
     return (
       <div>
+        { cancel }
         <Button
-          key='cancel'
-          label='Cancel'
-          icon={ <ContentClear /> }
-          onClick={ onClose }
-        />
-        <Button
-          key='close'
-          label='Done'
-          icon={ <ActionDoneAll /> }
-          onClick={ onClose }
+          key='next' label='Next'
+          icon={ <IdentityIcon address={ account } button /> }
+          onClick={ this.next }
         />
       </div>
     );
   }
+
+  renderStep () {
+    const { step } = this.state;
+    if (step === 1) {
+      return this.renderSecondStep();
+    } else {
+      return this.renderFirstStep();
+    }
+  }
+
+  next = () => {
+    this.setState({
+      step: this.state.step + 1
+    });
+  }
+
+  renderFirstStep () {
+    return (
+      <span>first step</span>
+    );
+  }
+
+  renderSecondStep () {
+    return (
+      <span>second step</span>
+    );
+  }
 }
diff --git a/js/src/views/Account/account.js b/js/src/views/Account/account.js
index 2e0759242..8ddd2d989 100644
--- a/js/src/views/Account/account.js
+++ b/js/src/views/Account/account.js
@@ -166,7 +166,10 @@ class Account extends Component {
 
     // TODO: pass props
     return (
-      <SMSVerification onClose={ this.onVerificationClose } />
+      <SMSVerification
+        account={ address }
+        onClose={ this.onVerificationClose }
+      />
     );
   }
 

From 1a245405e5c1de26a990e90863b8692f7b9ce871 Mon Sep 17 00:00:00 2001
From: Jannis R <mail@jannisr.de>
Date: Thu, 3 Nov 2016 19:21:38 +0100
Subject: [PATCH 04/57] query phone number & consent

---
 js/package.json                               |  1 +
 .../modals/SMSVerification/SMSVerification.js | 23 ++++--
 .../SMSVerification/SendRequest/index.js      | 17 ++++
 .../SendRequest/sendRequest.css               | 19 +++++
 .../SendRequest/sendRequest.js                | 82 +++++++++++++++++++
 5 files changed, 136 insertions(+), 6 deletions(-)
 create mode 100644 js/src/modals/SMSVerification/SendRequest/index.js
 create mode 100644 js/src/modals/SMSVerification/SendRequest/sendRequest.css
 create mode 100644 js/src/modals/SMSVerification/SendRequest/sendRequest.js

diff --git a/js/package.json b/js/package.json
index 0eae50582..4a6ba3f44 100644
--- a/js/package.json
+++ b/js/package.json
@@ -132,6 +132,7 @@
     "mobx-react": "^3.5.8",
     "mobx-react-devtools": "^4.2.9",
     "moment": "^2.14.1",
+    "phoneformat.js": "^1.0.3",
     "qs": "^6.3.0",
     "react": "^15.2.1",
     "react-addons-css-transition-group": "^15.2.1",
diff --git a/js/src/modals/SMSVerification/SMSVerification.js b/js/src/modals/SMSVerification/SMSVerification.js
index 75330bd21..bfbbf1a6f 100644
--- a/js/src/modals/SMSVerification/SMSVerification.js
+++ b/js/src/modals/SMSVerification/SMSVerification.js
@@ -24,7 +24,7 @@ import { validateAddress, validateUint } from '../../util/validation';
 import ABI from '../../contracts/abi/sms-verification.json';
 const contract = '0x7B3F58965439b22ef1dA4BB78f16191d11ab80B0';
 
-// import DetailsStep from './DetailsStep';
+import SendRequest from './SendRequest';
 
 export default class SMSVerification extends Component {
   static contextTypes = {
@@ -40,6 +40,7 @@ export default class SMSVerification extends Component {
   state = {
     contract: null,
     step: 0,
+    stepIsValid: false,
     number: null,
     numberError: null
   }
@@ -70,7 +71,7 @@ export default class SMSVerification extends Component {
 
   renderDialogActions () {
     const { onClose, account } = this.props;
-    const { step } = this.state;
+    const { step, stepIsValid } = this.state;
 
     const cancel = (
       <Button
@@ -98,6 +99,7 @@ export default class SMSVerification extends Component {
         { cancel }
         <Button
           key='next' label='Next'
+          disabled={ !stepIsValid }
           icon={ <IdentityIcon address={ account } button /> }
           onClick={ this.next }
         />
@@ -114,15 +116,24 @@ export default class SMSVerification extends Component {
     }
   }
 
+  onDataIsValid = () => {
+    this.setState({ stepIsValid: true });
+  }
+
+  onDataIsInvalid = () => {
+    this.setState({ stepIsValid: false });
+  }
+
   next = () => {
-    this.setState({
-      step: this.state.step + 1
-    });
+    this.setState({ step: this.state.step + 1 });
   }
 
   renderFirstStep () {
     return (
-      <span>first step</span>
+      <SendRequest
+        onDataIsValid={ this.onDataIsValid }
+        onDataIsInvalid={ this.onDataIsInvalid }
+      />
     );
   }
 
diff --git a/js/src/modals/SMSVerification/SendRequest/index.js b/js/src/modals/SMSVerification/SendRequest/index.js
new file mode 100644
index 000000000..1a8bfaf73
--- /dev/null
+++ b/js/src/modals/SMSVerification/SendRequest/index.js
@@ -0,0 +1,17 @@
+// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+export default from './sendRequest';
diff --git a/js/src/modals/SMSVerification/SendRequest/sendRequest.css b/js/src/modals/SMSVerification/SendRequest/sendRequest.css
new file mode 100644
index 000000000..ac956063c
--- /dev/null
+++ b/js/src/modals/SMSVerification/SendRequest/sendRequest.css
@@ -0,0 +1,19 @@
+/* Copyright 2015, 2016 Ethcore (UK) Ltd.
+/* This file is part of Parity.
+/*
+/* Parity is free software: you can redistribute it and/or modify
+/* it under the terms of the GNU General Public License as published by
+/* the Free Software Foundation, either version 3 of the License, or
+/* (at your option) any later version.
+/*
+/* Parity is distributed in the hope that it will be useful,
+/* but WITHOUT ANY WARRANTY; without even the implied warranty of
+/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+/* GNU General Public License for more details.
+/*
+/* You should have received a copy of the GNU General Public License
+/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+*/
+.spacing {
+  margin-top: 1.5em;
+}
diff --git a/js/src/modals/SMSVerification/SendRequest/sendRequest.js b/js/src/modals/SMSVerification/SendRequest/sendRequest.js
new file mode 100644
index 000000000..82ff34f7e
--- /dev/null
+++ b/js/src/modals/SMSVerification/SendRequest/sendRequest.js
@@ -0,0 +1,82 @@
+// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+import React, { Component, PropTypes } from 'react';
+import { Checkbox } from 'material-ui';
+import phone from 'phoneformat.js';
+
+import { Form, Input } from '../../../ui';
+
+import styles from './SendRequest.css';
+
+export default class SendRequest extends Component {
+  static propTypes = {
+    onDataIsValid: PropTypes.func.isRequired,
+    onDataIsInvalid: PropTypes.func.isRequired
+  }
+
+  state = {
+    numberIsValid: null,
+    consentGiven: false
+  };
+
+  render () {
+    const { numberIsValid } = this.state;
+
+    return (
+      <Form>
+        <Input
+          label={ 'phone number' }
+          hint={ 'the sms will be sent to this number' }
+          error={ numberIsValid ? null : 'invalid number' }
+          onChange={ this.numberOnChange }
+          onSubmit={ this.numberOnSubmit }
+        />
+        <Checkbox
+          className={ styles.spacing }
+          label={ 'I agree that my number will be stored.' }
+          onCheck={ this.consentOnChange }
+        />
+      </Form>
+    );
+  }
+
+  numberOnSubmit = (value) => {
+    this.numberOnChange(null, value);
+  }
+
+  numberOnChange = (_, value) => {
+    this.setState({
+      numberIsValid: phone.isValidNumber(value)
+    }, this.onChange);
+  }
+
+  consentOnChange = (_, consentGiven) => {
+    this.setState({
+      consentGiven: !!consentGiven
+    }, this.onChange);
+  }
+
+  onChange = () => {
+    const { numberIsValid, consentGiven } = this.state;
+
+    if (numberIsValid && consentGiven) {
+      this.props.onDataIsValid();
+    } else {
+      this.props.onDataIsInvalid();
+    }
+  }
+}

From 435d3c24dbcb570bee3321b950f92ec7b7c3b334 Mon Sep 17 00:00:00 2001
From: Jannis R <mail@jannisr.de>
Date: Mon, 7 Nov 2016 10:23:42 +0100
Subject: [PATCH 05/57] SendRequest -> GatherData

---
 .../sendRequest.css => GatherData/gatherData.css}             | 0
 .../{SendRequest/sendRequest.js => GatherData/gatherData.js}  | 4 ++--
 .../SMSVerification/{SendRequest => GatherData}/index.js      | 2 +-
 js/src/modals/SMSVerification/SMSVerification.js              | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)
 rename js/src/modals/SMSVerification/{SendRequest/sendRequest.css => GatherData/gatherData.css} (100%)
 rename js/src/modals/SMSVerification/{SendRequest/sendRequest.js => GatherData/gatherData.js} (95%)
 rename js/src/modals/SMSVerification/{SendRequest => GatherData}/index.js (94%)

diff --git a/js/src/modals/SMSVerification/SendRequest/sendRequest.css b/js/src/modals/SMSVerification/GatherData/gatherData.css
similarity index 100%
rename from js/src/modals/SMSVerification/SendRequest/sendRequest.css
rename to js/src/modals/SMSVerification/GatherData/gatherData.css
diff --git a/js/src/modals/SMSVerification/SendRequest/sendRequest.js b/js/src/modals/SMSVerification/GatherData/gatherData.js
similarity index 95%
rename from js/src/modals/SMSVerification/SendRequest/sendRequest.js
rename to js/src/modals/SMSVerification/GatherData/gatherData.js
index 82ff34f7e..3e0ce15cb 100644
--- a/js/src/modals/SMSVerification/SendRequest/sendRequest.js
+++ b/js/src/modals/SMSVerification/GatherData/gatherData.js
@@ -20,9 +20,9 @@ import phone from 'phoneformat.js';
 
 import { Form, Input } from '../../../ui';
 
-import styles from './SendRequest.css';
+import styles from './gatherData.css';
 
-export default class SendRequest extends Component {
+export default class GatherData extends Component {
   static propTypes = {
     onDataIsValid: PropTypes.func.isRequired,
     onDataIsInvalid: PropTypes.func.isRequired
diff --git a/js/src/modals/SMSVerification/SendRequest/index.js b/js/src/modals/SMSVerification/GatherData/index.js
similarity index 94%
rename from js/src/modals/SMSVerification/SendRequest/index.js
rename to js/src/modals/SMSVerification/GatherData/index.js
index 1a8bfaf73..1c03d3400 100644
--- a/js/src/modals/SMSVerification/SendRequest/index.js
+++ b/js/src/modals/SMSVerification/GatherData/index.js
@@ -14,4 +14,4 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-export default from './sendRequest';
+export default from './gatherData';
diff --git a/js/src/modals/SMSVerification/SMSVerification.js b/js/src/modals/SMSVerification/SMSVerification.js
index bfbbf1a6f..a1b306363 100644
--- a/js/src/modals/SMSVerification/SMSVerification.js
+++ b/js/src/modals/SMSVerification/SMSVerification.js
@@ -24,7 +24,7 @@ import { validateAddress, validateUint } from '../../util/validation';
 import ABI from '../../contracts/abi/sms-verification.json';
 const contract = '0x7B3F58965439b22ef1dA4BB78f16191d11ab80B0';
 
-import SendRequest from './SendRequest';
+import GatherData from './GatherData';
 
 export default class SMSVerification extends Component {
   static contextTypes = {
@@ -130,7 +130,7 @@ export default class SMSVerification extends Component {
 
   renderFirstStep () {
     return (
-      <SendRequest
+      <GatherData
         onDataIsValid={ this.onDataIsValid }
         onDataIsInvalid={ this.onDataIsInvalid }
       />

From 14da2d280585c475fc3f3db3c1483b13840cec54 Mon Sep 17 00:00:00 2001
From: Jannis R <mail@jannisr.de>
Date: Mon, 7 Nov 2016 13:18:36 +0100
Subject: [PATCH 06/57] sms verification: check if certified

---
 .../CheckIfCertified/checkIfCertified.css     | 27 ++++++
 .../CheckIfCertified/checkIfCertified.js      | 88 +++++++++++++++++++
 .../SMSVerification/CheckIfCertified/index.js | 17 ++++
 .../modals/SMSVerification/SMSVerification.js | 17 +++-
 4 files changed, 147 insertions(+), 2 deletions(-)
 create mode 100644 js/src/modals/SMSVerification/CheckIfCertified/checkIfCertified.css
 create mode 100644 js/src/modals/SMSVerification/CheckIfCertified/checkIfCertified.js
 create mode 100644 js/src/modals/SMSVerification/CheckIfCertified/index.js

diff --git a/js/src/modals/SMSVerification/CheckIfCertified/checkIfCertified.css b/js/src/modals/SMSVerification/CheckIfCertified/checkIfCertified.css
new file mode 100644
index 000000000..13779b8f4
--- /dev/null
+++ b/js/src/modals/SMSVerification/CheckIfCertified/checkIfCertified.css
@@ -0,0 +1,27 @@
+/* Copyright 2015, 2016 Ethcore (UK) Ltd.
+/* This file is part of Parity.
+/*
+/* Parity is free software: you can redistribute it and/or modify
+/* it under the terms of the GNU General Public License as published by
+/* the Free Software Foundation, either version 3 of the License, or
+/* (at your option) any later version.
+/*
+/* Parity is distributed in the hope that it will be useful,
+/* but WITHOUT ANY WARRANTY; without even the implied warranty of
+/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+/* GNU General Public License for more details.
+/*
+/* You should have received a copy of the GNU General Public License
+/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+.container {
+  display: flex;
+  align-items: center;
+}
+
+.message {
+  margin-top: 0;
+  margin-bottom: 0;
+  margin-left: .5em;
+}
diff --git a/js/src/modals/SMSVerification/CheckIfCertified/checkIfCertified.js b/js/src/modals/SMSVerification/CheckIfCertified/checkIfCertified.js
new file mode 100644
index 000000000..d28665855
--- /dev/null
+++ b/js/src/modals/SMSVerification/CheckIfCertified/checkIfCertified.js
@@ -0,0 +1,88 @@
+// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+import React, { Component, PropTypes } from 'react';
+import { Checkbox } from 'material-ui';
+import SuccessIcon from 'material-ui/svg-icons/navigation/check';
+import ErrorIcon from 'material-ui/svg-icons/alert/error-outline';
+
+import { Form, Input } from '../../../ui';
+
+import styles from './checkIfCertified.css';
+
+export default class CheckIfCertified extends Component {
+  static contextTypes = {
+    api: PropTypes.object.isRequired
+  }
+
+  static propTypes = {
+    account: PropTypes.string.isRequired,
+    contract: PropTypes.object.isRequired,
+    onIsCertified: PropTypes.func.isRequired,
+    onIsNotCertified: PropTypes.func.isRequired
+  }
+
+  state = {
+    pending: false,
+    isCertified: null
+  };
+
+  componentWillMount () {
+    const { pending } = this.state;
+    if (pending) {
+      return;
+    }
+    this.setState({ pending: true });
+
+    const { account, contract, onIsCertified, onIsNotCertified } = this.props;
+
+    contract.instance.certified.call({}, [account])
+      .then((isCertified) => {
+        this.setState({ isCertified, pending: false });
+        if (isCertified) {
+          onIsCertified();
+        } else {
+          onIsNotCertified();
+        }
+      })
+      .catch((err) => {
+        console.error('error checking if certified', err);
+      });
+  }
+
+  render () {
+    const { pending, isCertified } = this.state;
+
+    if (pending) {
+      return (<p className={ styles.message }>Checking if your account is verified…</p>);
+    }
+
+    if (isCertified) {
+      return (
+        <div className={ styles.container }>
+          <ErrorIcon />
+          <p className={ styles.message }>Your account is already verified.</p>
+        </div>
+      );
+    }
+    return (
+      <div className={ styles.container }>
+        <SuccessIcon />
+        <p className={ styles.message }>Your account is not verified yet.</p>
+      </div>
+    );
+  }
+}
diff --git a/js/src/modals/SMSVerification/CheckIfCertified/index.js b/js/src/modals/SMSVerification/CheckIfCertified/index.js
new file mode 100644
index 000000000..2577505e2
--- /dev/null
+++ b/js/src/modals/SMSVerification/CheckIfCertified/index.js
@@ -0,0 +1,17 @@
+// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+export default from './checkIfCertified';
diff --git a/js/src/modals/SMSVerification/SMSVerification.js b/js/src/modals/SMSVerification/SMSVerification.js
index a1b306363..be8353acf 100644
--- a/js/src/modals/SMSVerification/SMSVerification.js
+++ b/js/src/modals/SMSVerification/SMSVerification.js
@@ -24,6 +24,7 @@ import { validateAddress, validateUint } from '../../util/validation';
 import ABI from '../../contracts/abi/sms-verification.json';
 const contract = '0x7B3F58965439b22ef1dA4BB78f16191d11ab80B0';
 
+import CheckIfCertified from './CheckIfCertified';
 import GatherData from './GatherData';
 
 export default class SMSVerification extends Component {
@@ -119,16 +120,28 @@ export default class SMSVerification extends Component {
   onDataIsValid = () => {
     this.setState({ stepIsValid: true });
   }
-
   onDataIsInvalid = () => {
     this.setState({ stepIsValid: false });
   }
 
   next = () => {
-    this.setState({ step: this.state.step + 1 });
+    this.setState({ step: this.state.step + 1, stepIsValid: false });
   }
 
   renderFirstStep () {
+    const { account } = this.props;
+    const { contract } = this.state;
+
+    return (
+      <CheckIfCertified
+        account={ account } contract={ contract }
+        onIsCertified={ this.onDataIsInvalid }
+        onIsNotCertified={ this.onDataIsValid }
+      />
+    );
+  }
+
+  renderSecondStep () {
     return (
       <GatherData
         onDataIsValid={ this.onDataIsValid }

From 4c199ef71663ebc75e417c2b95bc2995821ade94 Mon Sep 17 00:00:00 2001
From: Jannis R <mail@jannisr.de>
Date: Mon, 7 Nov 2016 13:34:53 +0100
Subject: [PATCH 07/57] sms verification: collect data

---
 js/src/modals/SMSVerification/GatherData/gatherData.js | 5 ++++-
 js/src/modals/SMSVerification/SMSVerification.js       | 8 ++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/js/src/modals/SMSVerification/GatherData/gatherData.js b/js/src/modals/SMSVerification/GatherData/gatherData.js
index 3e0ce15cb..92317567b 100644
--- a/js/src/modals/SMSVerification/GatherData/gatherData.js
+++ b/js/src/modals/SMSVerification/GatherData/gatherData.js
@@ -25,7 +25,8 @@ import styles from './gatherData.css';
 export default class GatherData extends Component {
   static propTypes = {
     onDataIsValid: PropTypes.func.isRequired,
-    onDataIsInvalid: PropTypes.func.isRequired
+    onDataIsInvalid: PropTypes.func.isRequired,
+    onData: PropTypes.func.isRequired
   }
 
   state = {
@@ -56,6 +57,7 @@ export default class GatherData extends Component {
 
   numberOnSubmit = (value) => {
     this.numberOnChange(null, value);
+    this.props.onData({ number: value });
   }
 
   numberOnChange = (_, value) => {
@@ -68,6 +70,7 @@ export default class GatherData extends Component {
     this.setState({
       consentGiven: !!consentGiven
     }, this.onChange);
+    this.props.onData({ consent: consentGiven });
   }
 
   onChange = () => {
diff --git a/js/src/modals/SMSVerification/SMSVerification.js b/js/src/modals/SMSVerification/SMSVerification.js
index be8353acf..478b0b953 100644
--- a/js/src/modals/SMSVerification/SMSVerification.js
+++ b/js/src/modals/SMSVerification/SMSVerification.js
@@ -42,8 +42,7 @@ export default class SMSVerification extends Component {
     contract: null,
     step: 0,
     stepIsValid: false,
-    number: null,
-    numberError: null
+    data: {}
   }
 
   componentDidMount () {
@@ -123,6 +122,11 @@ export default class SMSVerification extends Component {
   onDataIsInvalid = () => {
     this.setState({ stepIsValid: false });
   }
+  onData = (data) => {
+    this.setState({
+      data: Object.assign({}, this.state.data, data)
+    });
+  }
 
   next = () => {
     this.setState({ step: this.state.step + 1, stepIsValid: false });

From 89a2917935fd310a97181825e02ec69e796d3c88 Mon Sep 17 00:00:00 2001
From: Jannis R <mail@jannisr.de>
Date: Mon, 7 Nov 2016 15:13:22 +0100
Subject: [PATCH 08/57] boilerplate for third step

---
 .../modals/SMSVerification/SMSVerification.js | 27 +++++++++++++++----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/js/src/modals/SMSVerification/SMSVerification.js b/js/src/modals/SMSVerification/SMSVerification.js
index 478b0b953..6af633fd3 100644
--- a/js/src/modals/SMSVerification/SMSVerification.js
+++ b/js/src/modals/SMSVerification/SMSVerification.js
@@ -26,6 +26,7 @@ const contract = '0x7B3F58965439b22ef1dA4BB78f16191d11ab80B0';
 
 import CheckIfCertified from './CheckIfCertified';
 import GatherData from './GatherData';
+import SendRequest from './SendRequest';
 
 export default class SMSVerification extends Component {
   static contextTypes = {
@@ -62,7 +63,7 @@ export default class SMSVerification extends Component {
         title='verify your account via SMS'
         visible scroll
         current={ step }
-        steps={ ['first step', 'second step'] }
+        steps={ ['first step', 'second step', 'third step'] }
       >
         { this.renderStep() }
       </Modal>
@@ -81,7 +82,7 @@ export default class SMSVerification extends Component {
       />
     );
 
-    if (step === 1) {
+    if (step === 2) {
       return (
         <div>
           { cancel }
@@ -108,8 +109,15 @@ export default class SMSVerification extends Component {
   }
 
   renderStep () {
+    const { contract } = this.state;
+    if (!contract) {
+      return null;
+    }
+
     const { step } = this.state;
-    if (step === 1) {
+    if (step === 2) {
+      return this.renderThirdStep();
+    } else if (step === 1) {
       return this.renderSecondStep();
     } else {
       return this.renderFirstStep();
@@ -148,15 +156,24 @@ export default class SMSVerification extends Component {
   renderSecondStep () {
     return (
       <GatherData
+        onData={ this.onData }
         onDataIsValid={ this.onDataIsValid }
         onDataIsInvalid={ this.onDataIsInvalid }
       />
     );
   }
 
-  renderSecondStep () {
+  renderThirdStep () {
+    const { account } = this.props;
+    const { contract, data } = this.state;
+
     return (
-      <span>second step</span>
+      <SendRequest
+        account={ account } contract={ contract } data={ data }
+        onData={ this.onData }
+        onSuccess={ this.onDataIsValid }
+        onError={ this.onDataIsInvalid }
+      />
     );
   }
 }

From d0d737d1e353747de49e3e7ad64709346dc7f0d7 Mon Sep 17 00:00:00 2001
From: Jannis R <mail@jannisr.de>
Date: Tue, 8 Nov 2016 12:42:32 +0100
Subject: [PATCH 09/57] sms verification: post request transaction

---
 .../SMSVerification/SendRequest/index.js      |  17 +++
 .../SendRequest/sendRequest.js                | 113 ++++++++++++++++++
 2 files changed, 130 insertions(+)
 create mode 100644 js/src/modals/SMSVerification/SendRequest/index.js
 create mode 100644 js/src/modals/SMSVerification/SendRequest/sendRequest.js

diff --git a/js/src/modals/SMSVerification/SendRequest/index.js b/js/src/modals/SMSVerification/SendRequest/index.js
new file mode 100644
index 000000000..1a8bfaf73
--- /dev/null
+++ b/js/src/modals/SMSVerification/SendRequest/index.js
@@ -0,0 +1,17 @@
+// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+export default from './sendRequest';
diff --git a/js/src/modals/SMSVerification/SendRequest/sendRequest.js b/js/src/modals/SMSVerification/SendRequest/sendRequest.js
new file mode 100644
index 000000000..1cfb757af
--- /dev/null
+++ b/js/src/modals/SMSVerification/SendRequest/sendRequest.js
@@ -0,0 +1,113 @@
+// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+import React, { Component, PropTypes } from 'react';
+import { Checkbox } from 'material-ui';
+
+import { Form, Input } from '../../../ui';
+import TxHash from '../../../ui/TxHash';
+
+import { toWei } from '../../../api/util/wei';
+import { sha3 } from '../../../api/util/sha3';
+
+// import styles from './sendRequest.css';
+
+export default class SendRequest extends Component {
+  static contextTypes = {
+    api: PropTypes.object.isRequired
+  }
+
+  static propTypes = {
+    account: PropTypes.string.isRequired,
+    contract: PropTypes.object.isRequired,
+    data: PropTypes.object.isRequired,
+    onData: PropTypes.func.isRequired,
+    onSuccess: PropTypes.func.isRequired,
+    onError: PropTypes.func.isRequired
+  }
+
+  state = {
+    init: true,
+    step: 'init'
+  };
+
+  componentWillMount () {
+    const { init } = this.state;
+    if (init) {
+      this.send();
+      this.setState({ init: false });
+    }
+  }
+
+  render () {
+    const { step } = this.state;
+
+    if (step === 'error') {
+      return (<p>{ this.state.error }</p>);
+    }
+
+    if (step === 'pending') {
+      return (<p>Waiting for authorization by the Parity Signer.</p>);
+    }
+
+    if (step === 'posted') {
+      return (
+        <div>
+          <p>The transaction has been sent to the network.</p>
+          <TxHash hash={ this.props.data.txHash } />
+        </div>
+      );
+    }
+
+    return null;
+  }
+
+  send = () => {
+    const { api } = this.context;
+    const { account, contract, onData, onError } = this.props;
+    // const { number } = this.props.data;
+
+    // TODO: redeploy SMSVerification.sol, it has a public fee prop now
+    const fee = toWei(.01); // .01 Eth
+
+    const request = contract.functions.find((fn) => fn.name === 'request');
+    const options = { from: account, value: fee.toString() };
+
+    request.estimateGas(options, [])
+      .then((gas) => {
+        options.gas = gas.mul(1.2).toFixed(0);
+        // TODO: show message
+        this.setState({ step: 'pending' });
+        return request.postTransaction(options, []);
+      })
+      .then((handle) => {
+        // TODO: The "request rejected" error doesn't have any property to
+        // distinguish it from other errors, so we can't give a meaningful error here.
+        return api.pollMethod('parity_checkRequest', handle);
+      })
+      .then((txHash) => {
+        onData({ txHash: txHash });
+        this.setState({ step: 'posted' });
+        // TODO: subscribe to `Requested`
+      })
+      .catch((err) => {
+        console.error('failed to request sms verification', err);
+        onError(err);
+        this.setState({ step: 'error', error: err.message });
+        // TODO: show message in SnackBar
+      });
+  }
+}

From 3ef54f9172ec7c371d6fe1149fd790b0fe1660bb Mon Sep 17 00:00:00 2001
From: Jannis R <mail@jannisr.de>
Date: Tue, 8 Nov 2016 16:54:25 +0100
Subject: [PATCH 10/57] sms verification: wait for tx confirmations

---
 .../SendRequest/sendRequest.css               | 19 ++++++++++
 .../SendRequest/sendRequest.js                | 37 +++++++++++++++----
 2 files changed, 49 insertions(+), 7 deletions(-)
 create mode 100644 js/src/modals/SMSVerification/SendRequest/sendRequest.css

diff --git a/js/src/modals/SMSVerification/SendRequest/sendRequest.css b/js/src/modals/SMSVerification/SendRequest/sendRequest.css
new file mode 100644
index 000000000..563bf01ad
--- /dev/null
+++ b/js/src/modals/SMSVerification/SendRequest/sendRequest.css
@@ -0,0 +1,19 @@
+/* Copyright 2015, 2016 Ethcore (UK) Ltd.
+/* This file is part of Parity.
+/*
+/* Parity is free software: you can redistribute it and/or modify
+/* it under the terms of the GNU General Public License as published by
+/* the Free Software Foundation, either version 3 of the License, or
+/* (at your option) any later version.
+/*
+/* Parity is distributed in the hope that it will be useful,
+/* but WITHOUT ANY WARRANTY; without even the implied warranty of
+/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+/* GNU General Public License for more details.
+/*
+/* You should have received a copy of the GNU General Public License
+/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+*/
+.centered {
+  text-align: center;
+}
diff --git a/js/src/modals/SMSVerification/SendRequest/sendRequest.js b/js/src/modals/SMSVerification/SendRequest/sendRequest.js
index 1cfb757af..9e3a1ffe8 100644
--- a/js/src/modals/SMSVerification/SendRequest/sendRequest.js
+++ b/js/src/modals/SMSVerification/SendRequest/sendRequest.js
@@ -23,7 +23,7 @@ import TxHash from '../../../ui/TxHash';
 import { toWei } from '../../../api/util/wei';
 import { sha3 } from '../../../api/util/sha3';
 
-// import styles from './sendRequest.css';
+import styles from './sendRequest.css';
 
 export default class SendRequest extends Component {
   static contextTypes = {
@@ -65,11 +65,13 @@ export default class SendRequest extends Component {
 
     if (step === 'posted') {
       return (
-        <div>
-          <p>The transaction has been sent to the network.</p>
-          <TxHash hash={ this.props.data.txHash } />
-        </div>
-      );
+        <div className={ styles.centered }>
+          <TxHash hash={ this.props.data.txHash } maxConfirmations={ 3 } />
+        </div>);
+    }
+
+    if (step === 'mined') {
+      return (<p>mined</p>);
     }
 
     return null;
@@ -101,7 +103,28 @@ export default class SendRequest extends Component {
       .then((txHash) => {
         onData({ txHash: txHash });
         this.setState({ step: 'posted' });
-        // TODO: subscribe to `Requested`
+
+        return api.pollMethod('eth_getTransactionReceipt', txHash, (receipt) => {
+          return receipt && receipt.blockNumber && receipt.blockNumber.gt(0);
+        });
+      })
+      .then((receipt) => new Promise((resolve, reject) => {
+        let subscription;
+        api.subscribe('eth_blockNumber', (err, block) => {
+          if (err) {
+            reject(err);
+          } else if (block.minus(2).gte(receipt.blockNumber)) {
+            api.unsubscribe(subscription);
+            resolve();
+          }
+        })
+        .then((_subscription) => {
+          subscription = _subscription;
+        })
+        .catch(reject);
+      }))
+      .then(() => {
+        this.setState({ step: 'mined' });
       })
       .catch((err) => {
         console.error('failed to request sms verification', err);

From 4931381e0e8f811bd98686ac58a0ba26326229a3 Mon Sep 17 00:00:00 2001
From: Jannis R <mail@jannisr.de>
Date: Tue, 8 Nov 2016 16:55:11 +0100
Subject: [PATCH 11/57] txHash component: add maxConfirmations prop

---
 js/src/ui/TxHash/txHash.js | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/js/src/ui/TxHash/txHash.js b/js/src/ui/TxHash/txHash.js
index 5af000499..87d1850f7 100644
--- a/js/src/ui/TxHash/txHash.js
+++ b/js/src/ui/TxHash/txHash.js
@@ -31,9 +31,14 @@ class TxHash extends Component {
   static propTypes = {
     hash: PropTypes.string.isRequired,
     isTest: PropTypes.bool,
-    summary: PropTypes.bool
+    summary: PropTypes.bool,
+    maxConfirmations: PropTypes.number
   }
 
+  static defaultProps = {
+    maxConfirmations: 10
+  };
+
   state = {
     blockNumber: new BigNumber(0),
     transaction: null,
@@ -79,6 +84,7 @@ class TxHash extends Component {
   }
 
   renderConfirmations () {
+    const { maxConfirmations } = this.props;
     const { blockNumber, transaction } = this.state;
 
     let txBlock = 'Pending';
@@ -89,14 +95,14 @@ class TxHash extends Component {
       const num = blockNumber.minus(transaction.blockNumber).plus(1);
       txBlock = `#${transaction.blockNumber.toFormat(0)}`;
       confirmations = num.toFormat(0);
-      value = num.gt(10) ? 10 : num.toNumber();
+      value = num.gt(maxConfirmations) ? maxConfirmations : num.toNumber();
     }
 
     return (
       <div className={ styles.confirm }>
         <LinearProgress
           className={ styles.progressbar }
-          min={ 0 } max={ 10 } value={ value }
+          min={ 0 } max={ maxConfirmations } value={ value }
           color='white'
           mode='determinate' />
         <div className={ styles.progressinfo }>

From a56a1d3aef23136d5801fecd3ab5180009b2dea9 Mon Sep 17 00:00:00 2001
From: Jannis R <mail@jannisr.de>
Date: Tue, 8 Nov 2016 17:29:37 +0100
Subject: [PATCH 12/57] sms verification: request SMS

---
 .../SendRequest/sendRequest.js                | 31 +++++++++++++++++--
 1 file changed, 28 insertions(+), 3 deletions(-)

diff --git a/js/src/modals/SMSVerification/SendRequest/sendRequest.js b/js/src/modals/SMSVerification/SendRequest/sendRequest.js
index 9e3a1ffe8..5c2e3dc0a 100644
--- a/js/src/modals/SMSVerification/SendRequest/sendRequest.js
+++ b/js/src/modals/SMSVerification/SendRequest/sendRequest.js
@@ -16,6 +16,7 @@
 
 import React, { Component, PropTypes } from 'react';
 import { Checkbox } from 'material-ui';
+import qs from 'querystring';
 
 import { Form, Input } from '../../../ui';
 import TxHash from '../../../ui/TxHash';
@@ -25,6 +26,21 @@ import { sha3 } from '../../../api/util/sha3';
 
 import styles from './sendRequest.css';
 
+const postToVerificationServer = (query) => {
+  query = qs.stringify(query);
+  return fetch('https://sms-verification.parity.io/?' + query, {
+    method: 'POST', mode: 'cors', cache: 'no-store'
+  })
+  .then((res) => {
+    return res.json().then((data) => {
+      if (res.ok) {
+        return data.message;
+      }
+      throw new Error(data.message || 'unknown error');
+    });
+  });
+};
+
 export default class SendRequest extends Component {
   static contextTypes = {
     api: PropTypes.object.isRequired
@@ -71,7 +87,11 @@ export default class SendRequest extends Component {
     }
 
     if (step === 'mined') {
-      return (<p>mined</p>);
+      return (<p>Requesting an SMS from the Parity server.</p>);
+    }
+
+    if (step === 'sms-sent') {
+      return (<p>The SMS has been sent to { this.props.data.number }</p>);
     }
 
     return null;
@@ -79,8 +99,8 @@ export default class SendRequest extends Component {
 
   send = () => {
     const { api } = this.context;
-    const { account, contract, onData, onError } = this.props;
-    // const { number } = this.props.data;
+    const { account, contract, onData, onError, onSuccess } = this.props;
+    const { number } = this.props.data;
 
     // TODO: redeploy SMSVerification.sol, it has a public fee prop now
     const fee = toWei(.01); // .01 Eth
@@ -125,6 +145,11 @@ export default class SendRequest extends Component {
       }))
       .then(() => {
         this.setState({ step: 'mined' });
+        return postToVerificationServer({ number, address: account });
+      })
+      .then(() => {
+        this.setState({ step: 'sms-sent' });
+        onSuccess();
       })
       .catch((err) => {
         console.error('failed to request sms verification', err);

From ebf742f2af082635412fd279852795590fe8ae59 Mon Sep 17 00:00:00 2001
From: Jannis R <mail@jannisr.de>
Date: Tue, 8 Nov 2016 17:30:14 +0100
Subject: [PATCH 13/57] sms verification: update contract address & ABI

---
 js/src/contracts/abi/sms-verification.json       | 1 +
 js/src/modals/SMSVerification/SMSVerification.js | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 js/src/contracts/abi/sms-verification.json

diff --git a/js/src/contracts/abi/sms-verification.json b/js/src/contracts/abi/sms-verification.json
new file mode 100644
index 000000000..400d22b44
--- /dev/null
+++ b/js/src/contracts/abi/sms-verification.json
@@ -0,0 +1 @@
+[{"constant":false,"inputs":[{"name":"_new","type":"address"}],"name":"setOwner","outputs":[],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_who","type":"address"}],"name":"certify","outputs":[],"payable":false,"type":"function"},{"constant":false,"inputs":[],"name":"request","outputs":[],"payable":true,"type":"function"},{"constant":false,"inputs":[{"name":"_who","type":"address"},{"name":"_puzzle","type":"bytes32"}],"name":"puzzle","outputs":[],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"_who","type":"address"},{"name":"_field","type":"string"}],"name":"getAddress","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_new","type":"uint256"}],"name":"setFee","outputs":[],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_who","type":"address"}],"name":"revoke","outputs":[],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_code","type":"bytes32"}],"name":"confirm","outputs":[],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"owner","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":false,"inputs":[],"name":"drain","outputs":[],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"delegate","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"_who","type":"address"},{"name":"_field","type":"string"}],"name":"getUint","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"_new","type":"address"}],"name":"setDelegate","outputs":[],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"_who","type":"address"}],"name":"certified","outputs":[{"name":"","type":"bool"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"fee","outputs":[{"name":"","type":"uint256"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"_who","type":"address"},{"name":"_field","type":"string"}],"name":"get","outputs":[{"name":"","type":"bytes32"}],"payable":false,"type":"function"},{"anonymous":false,"inputs":[{"indexed":true,"name":"who","type":"address"}],"name":"Requested","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"who","type":"address"},{"indexed":false,"name":"puzzle","type":"bytes32"}],"name":"Puzzled","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"who","type":"address"}],"name":"Confirmed","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"who","type":"address"}],"name":"Revoked","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"old","type":"address"},{"indexed":true,"name":"current","type":"address"}],"name":"NewOwner","type":"event"}]
diff --git a/js/src/modals/SMSVerification/SMSVerification.js b/js/src/modals/SMSVerification/SMSVerification.js
index 6af633fd3..9cd414982 100644
--- a/js/src/modals/SMSVerification/SMSVerification.js
+++ b/js/src/modals/SMSVerification/SMSVerification.js
@@ -22,7 +22,7 @@ import { BusyStep, CompletedStep, Button, IdentityIcon, Modal } from '../../ui';
 import { validateAddress, validateUint } from '../../util/validation';
 
 import ABI from '../../contracts/abi/sms-verification.json';
-const contract = '0x7B3F58965439b22ef1dA4BB78f16191d11ab80B0';
+const contract = '0xcE381B876A85A72303f7cA7b3a012f58F4CEEEeB';
 
 import CheckIfCertified from './CheckIfCertified';
 import GatherData from './GatherData';

From e84531f31c89b07826564a023ef920aee0619878 Mon Sep 17 00:00:00 2001
From: Jannis R <mail@jannisr.de>
Date: Wed, 9 Nov 2016 12:50:02 +0100
Subject: [PATCH 14/57] sms verification: refactor contract call

---
 .../SendRequest/sendRequest.js                | 51 ++++++++++---------
 1 file changed, 27 insertions(+), 24 deletions(-)

diff --git a/js/src/modals/SMSVerification/SendRequest/sendRequest.js b/js/src/modals/SMSVerification/SendRequest/sendRequest.js
index 5c2e3dc0a..0017063d3 100644
--- a/js/src/modals/SMSVerification/SendRequest/sendRequest.js
+++ b/js/src/modals/SMSVerification/SendRequest/sendRequest.js
@@ -15,17 +15,38 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 import React, { Component, PropTypes } from 'react';
-import { Checkbox } from 'material-ui';
 import qs from 'querystring';
 
-import { Form, Input } from '../../../ui';
 import TxHash from '../../../ui/TxHash';
-
 import { toWei } from '../../../api/util/wei';
-import { sha3 } from '../../../api/util/sha3';
 
 import styles from './sendRequest.css';
 
+const isValidReceipt = (receipt) => {
+  return receipt && receipt.blockNumber && receipt.blockNumber.gt(0);
+};
+
+const waitForConfirmations = (api, tx, confirmations) => {
+  return new Promise((resolve, reject) => {
+    api.pollMethod('eth_getTransactionReceipt', tx, isValidReceipt)
+    .then((receipt) => {
+      let subscription;
+      api.subscribe('eth_blockNumber', (err, block) => {
+        if (err) {
+          reject(err);
+        } else if (block.minus(confirmations - 1).gte(receipt.blockNumber)) {
+          api.unsubscribe(subscription);
+          resolve();
+        }
+      })
+      .then((_subscription) => {
+        subscription = _subscription;
+      })
+      .catch(reject);
+    });
+  });
+};
+
 const postToVerificationServer = (query) => {
   query = qs.stringify(query);
   return fetch('https://sms-verification.parity.io/?' + query, {
@@ -103,7 +124,7 @@ export default class SendRequest extends Component {
     const { number } = this.props.data;
 
     // TODO: redeploy SMSVerification.sol, it has a public fee prop now
-    const fee = toWei(.01); // .01 Eth
+    const fee = toWei(0.01); // 0.01 Eth
 
     const request = contract.functions.find((fn) => fn.name === 'request');
     const options = { from: account, value: fee.toString() };
@@ -123,26 +144,8 @@ export default class SendRequest extends Component {
       .then((txHash) => {
         onData({ txHash: txHash });
         this.setState({ step: 'posted' });
-
-        return api.pollMethod('eth_getTransactionReceipt', txHash, (receipt) => {
-          return receipt && receipt.blockNumber && receipt.blockNumber.gt(0);
-        });
+        return waitForConfirmations(api, txHash, 3);
       })
-      .then((receipt) => new Promise((resolve, reject) => {
-        let subscription;
-        api.subscribe('eth_blockNumber', (err, block) => {
-          if (err) {
-            reject(err);
-          } else if (block.minus(2).gte(receipt.blockNumber)) {
-            api.unsubscribe(subscription);
-            resolve();
-          }
-        })
-        .then((_subscription) => {
-          subscription = _subscription;
-        })
-        .catch(reject);
-      }))
       .then(() => {
         this.setState({ step: 'mined' });
         return postToVerificationServer({ number, address: account });

From e7113e7eb408286ff26fb20c13f1672bad751298 Mon Sep 17 00:00:00 2001
From: Jannis R <mail@jannisr.de>
Date: Wed, 9 Nov 2016 13:23:07 +0100
Subject: [PATCH 15/57] sms verification: show fee in consent form

---
 .../SMSVerification/GatherData/gatherData.js  | 35 +++++++++++++++++--
 .../modals/SMSVerification/SMSVerification.js |  3 ++
 .../SendRequest/sendRequest.js                |  6 +---
 3 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/js/src/modals/SMSVerification/GatherData/gatherData.js b/js/src/modals/SMSVerification/GatherData/gatherData.js
index 92317567b..fd5d00791 100644
--- a/js/src/modals/SMSVerification/GatherData/gatherData.js
+++ b/js/src/modals/SMSVerification/GatherData/gatherData.js
@@ -18,27 +18,41 @@ import React, { Component, PropTypes } from 'react';
 import { Checkbox } from 'material-ui';
 import phone from 'phoneformat.js';
 
+import { fromWei } from '../../../api/util/wei';
 import { Form, Input } from '../../../ui';
 
 import styles from './gatherData.css';
 
 export default class GatherData extends Component {
   static propTypes = {
+    contract: PropTypes.object.isRequired,
+    data: PropTypes.object.isRequired,
+    onData: PropTypes.func.isRequired,
     onDataIsValid: PropTypes.func.isRequired,
-    onDataIsInvalid: PropTypes.func.isRequired,
-    onData: PropTypes.func.isRequired
+    onDataIsInvalid: PropTypes.func.isRequired
   }
 
   state = {
+    init: true,
     numberIsValid: null,
     consentGiven: false
   };
 
+  componentWillMount () {
+    const { init } = this.state;
+    if (init) {
+      this.queryFee();
+      this.setState({ init: false });
+    }
+  }
+
   render () {
+    const { fee } = this.props.data;
     const { numberIsValid } = this.state;
 
     return (
       <Form>
+        <p>{ fee ? `The fee is ${fromWei(fee).toFixed(3)} ETH.` : 'Fetching the fee…' }</p>
         <Input
           label={ 'phone number' }
           hint={ 'the sms will be sent to this number' }
@@ -55,6 +69,20 @@ export default class GatherData extends Component {
     );
   }
 
+  queryFee = () => {
+    const { contract, onData } = this.props;
+
+    contract.instance.fee.call()
+    .then((fee) => {
+      onData({ fee });
+      this.onChange();
+    })
+    .catch((err) => {
+      console.error('error fetching fee', err);
+      this.onChange();
+    });
+  }
+
   numberOnSubmit = (value) => {
     this.numberOnChange(null, value);
     this.props.onData({ number: value });
@@ -74,9 +102,10 @@ export default class GatherData extends Component {
   }
 
   onChange = () => {
+    const { fee } = this.props.data;
     const { numberIsValid, consentGiven } = this.state;
 
-    if (numberIsValid && consentGiven) {
+    if (fee && numberIsValid && consentGiven) {
       this.props.onDataIsValid();
     } else {
       this.props.onDataIsInvalid();
diff --git a/js/src/modals/SMSVerification/SMSVerification.js b/js/src/modals/SMSVerification/SMSVerification.js
index 9cd414982..97f11e540 100644
--- a/js/src/modals/SMSVerification/SMSVerification.js
+++ b/js/src/modals/SMSVerification/SMSVerification.js
@@ -154,8 +154,11 @@ export default class SMSVerification extends Component {
   }
 
   renderSecondStep () {
+    const { contract, data } = this.state;
+
     return (
       <GatherData
+        contract={ contract } data={ data }
         onData={ this.onData }
         onDataIsValid={ this.onDataIsValid }
         onDataIsInvalid={ this.onDataIsInvalid }
diff --git a/js/src/modals/SMSVerification/SendRequest/sendRequest.js b/js/src/modals/SMSVerification/SendRequest/sendRequest.js
index 0017063d3..8fba60b42 100644
--- a/js/src/modals/SMSVerification/SendRequest/sendRequest.js
+++ b/js/src/modals/SMSVerification/SendRequest/sendRequest.js
@@ -18,7 +18,6 @@ import React, { Component, PropTypes } from 'react';
 import qs from 'querystring';
 
 import TxHash from '../../../ui/TxHash';
-import { toWei } from '../../../api/util/wei';
 
 import styles from './sendRequest.css';
 
@@ -121,10 +120,7 @@ export default class SendRequest extends Component {
   send = () => {
     const { api } = this.context;
     const { account, contract, onData, onError, onSuccess } = this.props;
-    const { number } = this.props.data;
-
-    // TODO: redeploy SMSVerification.sol, it has a public fee prop now
-    const fee = toWei(0.01); // 0.01 Eth
+    const { fee, number } = this.props.data;
 
     const request = contract.functions.find((fn) => fn.name === 'request');
     const options = { from: account, value: fee.toString() };

From 7996ac47ec59d4c55a489eb9238863f66e763aa9 Mon Sep 17 00:00:00 2001
From: Jannis R <mail@jannisr.de>
Date: Wed, 9 Nov 2016 16:18:09 +0100
Subject: [PATCH 16/57] sms verification: polish UI, fix linting issues :shirt:

---
 .../SMSVerification/CheckIfCertified/checkIfCertified.js  | 3 ---
 js/src/modals/SMSVerification/SMSVerification.js          | 6 +++---
 js/src/modals/SMSVerification/SendRequest/sendRequest.js  | 8 ++++++--
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/js/src/modals/SMSVerification/CheckIfCertified/checkIfCertified.js b/js/src/modals/SMSVerification/CheckIfCertified/checkIfCertified.js
index d28665855..b9048f6e7 100644
--- a/js/src/modals/SMSVerification/CheckIfCertified/checkIfCertified.js
+++ b/js/src/modals/SMSVerification/CheckIfCertified/checkIfCertified.js
@@ -15,12 +15,9 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 import React, { Component, PropTypes } from 'react';
-import { Checkbox } from 'material-ui';
 import SuccessIcon from 'material-ui/svg-icons/navigation/check';
 import ErrorIcon from 'material-ui/svg-icons/alert/error-outline';
 
-import { Form, Input } from '../../../ui';
-
 import styles from './checkIfCertified.css';
 
 export default class CheckIfCertified extends Component {
diff --git a/js/src/modals/SMSVerification/SMSVerification.js b/js/src/modals/SMSVerification/SMSVerification.js
index 97f11e540..75df048a7 100644
--- a/js/src/modals/SMSVerification/SMSVerification.js
+++ b/js/src/modals/SMSVerification/SMSVerification.js
@@ -30,8 +30,7 @@ import SendRequest from './SendRequest';
 
 export default class SMSVerification extends Component {
   static contextTypes = {
-    api: PropTypes.object.isRequired,
-    // store: PropTypes.object.isRequired
+    api: PropTypes.object.isRequired
   }
 
   static propTypes = {
@@ -63,7 +62,7 @@ export default class SMSVerification extends Component {
         title='verify your account via SMS'
         visible scroll
         current={ step }
-        steps={ ['first step', 'second step', 'third step'] }
+        steps={ ['Preparations', 'Enter Data', 'Send Request'] }
       >
         { this.renderStep() }
       </Modal>
@@ -88,6 +87,7 @@ export default class SMSVerification extends Component {
           { cancel }
           <Button
             key='done' label='Done'
+            disabled={ !stepIsValid }
             icon={ <ActionDoneAll /> }
             onClick={ onClose }
           />
diff --git a/js/src/modals/SMSVerification/SendRequest/sendRequest.js b/js/src/modals/SMSVerification/SendRequest/sendRequest.js
index 8fba60b42..641bd187a 100644
--- a/js/src/modals/SMSVerification/SendRequest/sendRequest.js
+++ b/js/src/modals/SMSVerification/SendRequest/sendRequest.js
@@ -103,6 +103,7 @@ export default class SendRequest extends Component {
       return (
         <div className={ styles.centered }>
           <TxHash hash={ this.props.data.txHash } maxConfirmations={ 3 } />
+          <p>Please keep this window open.</p>
         </div>);
     }
 
@@ -111,7 +112,7 @@ export default class SendRequest extends Component {
     }
 
     if (step === 'sms-sent') {
-      return (<p>The SMS has been sent to { this.props.data.number }</p>);
+      return (<p>The verification code has been sent to { this.props.data.number }.</p>);
     }
 
     return null;
@@ -153,7 +154,10 @@ export default class SendRequest extends Component {
       .catch((err) => {
         console.error('failed to request sms verification', err);
         onError(err);
-        this.setState({ step: 'error', error: err.message });
+        this.setState({
+          step: 'error',
+          error: 'Failed to request a confirmation SMS: ' + err.message
+        });
         // TODO: show message in SnackBar
       });
   }

From f08e2a4b173f8646a122b2ab1ef7887d910b8165 Mon Sep 17 00:00:00 2001
From: Jannis R <mail@jannisr.de>
Date: Wed, 9 Nov 2016 16:54:38 +0100
Subject: [PATCH 17/57] sms verification: query code

---
 .../modals/SMSVerification/QueryCode/index.js | 17 +++++
 .../SMSVerification/QueryCode/queryCode.js    | 62 +++++++++++++++++++
 .../modals/SMSVerification/SMSVerification.js | 22 ++++++-
 3 files changed, 98 insertions(+), 3 deletions(-)
 create mode 100644 js/src/modals/SMSVerification/QueryCode/index.js
 create mode 100644 js/src/modals/SMSVerification/QueryCode/queryCode.js

diff --git a/js/src/modals/SMSVerification/QueryCode/index.js b/js/src/modals/SMSVerification/QueryCode/index.js
new file mode 100644
index 000000000..539c340f0
--- /dev/null
+++ b/js/src/modals/SMSVerification/QueryCode/index.js
@@ -0,0 +1,17 @@
+// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+export default from './queryCode';
diff --git a/js/src/modals/SMSVerification/QueryCode/queryCode.js b/js/src/modals/SMSVerification/QueryCode/queryCode.js
new file mode 100644
index 000000000..b85c6f5e5
--- /dev/null
+++ b/js/src/modals/SMSVerification/QueryCode/queryCode.js
@@ -0,0 +1,62 @@
+// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+import React, { Component, PropTypes } from 'react';
+
+import { Form, Input } from '../../../ui';
+
+// import styles from './gatherData.css';
+
+const isValidCode = /^[A-Z0-9_-]{7,14}$/i;
+
+export default class QueryCode extends Component {
+  static propTypes = {
+    data: PropTypes.object.isRequired,
+    onData: PropTypes.func.isRequired,
+    onDataIsValid: PropTypes.func.isRequired,
+    onDataIsInvalid: PropTypes.func.isRequired
+  }
+
+  render () {
+    const { code } = this.props.data;
+
+    return (
+      <Form>
+        <Input
+          label={ 'verification code' }
+          hint={ 'Enter the code you received via SMS.' }
+          error={ isValidCode.test(code) ? null : 'invalid code' }
+          onChange={ this.onChange }
+          onSubmit={ this.onSubmit }
+        />
+      </Form>
+    );
+  }
+
+  onChange = (_, code) => {
+    code = code.trim();
+    this.props.onData({ code });
+
+    if (isValidCode.test(code)) {
+      this.props.onDataIsValid();
+    } else {
+      this.props.onDataIsInvalid();
+    }
+  }
+  onSubmit = (code) => {
+    this.onChange(null, code);
+  }
+}
diff --git a/js/src/modals/SMSVerification/SMSVerification.js b/js/src/modals/SMSVerification/SMSVerification.js
index 75df048a7..ec5dc7d61 100644
--- a/js/src/modals/SMSVerification/SMSVerification.js
+++ b/js/src/modals/SMSVerification/SMSVerification.js
@@ -27,6 +27,7 @@ const contract = '0xcE381B876A85A72303f7cA7b3a012f58F4CEEEeB';
 import CheckIfCertified from './CheckIfCertified';
 import GatherData from './GatherData';
 import SendRequest from './SendRequest';
+import QueryCode from './QueryCode';
 
 export default class SMSVerification extends Component {
   static contextTypes = {
@@ -62,7 +63,7 @@ export default class SMSVerification extends Component {
         title='verify your account via SMS'
         visible scroll
         current={ step }
-        steps={ ['Preparations', 'Enter Data', 'Send Request'] }
+        steps={ ['Preparations', 'Enter Data', 'Send Request', 'Enter Code'] }
       >
         { this.renderStep() }
       </Modal>
@@ -81,7 +82,7 @@ export default class SMSVerification extends Component {
       />
     );
 
-    if (step === 2) {
+    if (step === 3) {
       return (
         <div>
           { cancel }
@@ -115,7 +116,9 @@ export default class SMSVerification extends Component {
     }
 
     const { step } = this.state;
-    if (step === 2) {
+    if (step === 3) {
+      return this.renderFourthStep();
+    } else if (step === 2) {
       return this.renderThirdStep();
     } else if (step === 1) {
       return this.renderSecondStep();
@@ -179,4 +182,17 @@ export default class SMSVerification extends Component {
       />
     );
   }
+
+  renderFourthStep () {
+    const { data } = this.state;
+
+    return (
+      <QueryCode
+        data={ data }
+        onData={ this.onData }
+        onDataIsValid={ this.onDataIsValid }
+        onDataIsInvalid={ this.onDataIsInvalid }
+      />
+    );
+  }
 }

From a42140edde7deb04f879ed3ca364ea597b731157 Mon Sep 17 00:00:00 2001
From: Jannis R <mail@jannisr.de>
Date: Wed, 9 Nov 2016 17:34:21 +0100
Subject: [PATCH 18/57] sms verification: send confirmation tx

---
 .../modals/SMSVerification/SMSVerification.js |  23 ++-
 .../SMSVerification/SendConfirmation/index.js |  17 ++
 .../SendConfirmation/sendConfirmation.css     |  19 +++
 .../SendConfirmation/sendConfirmation.js      | 145 ++++++++++++++++++
 .../SendRequest/sendRequest.js                |   1 +
 5 files changed, 202 insertions(+), 3 deletions(-)
 create mode 100644 js/src/modals/SMSVerification/SendConfirmation/index.js
 create mode 100644 js/src/modals/SMSVerification/SendConfirmation/sendConfirmation.css
 create mode 100644 js/src/modals/SMSVerification/SendConfirmation/sendConfirmation.js

diff --git a/js/src/modals/SMSVerification/SMSVerification.js b/js/src/modals/SMSVerification/SMSVerification.js
index ec5dc7d61..af3153fb9 100644
--- a/js/src/modals/SMSVerification/SMSVerification.js
+++ b/js/src/modals/SMSVerification/SMSVerification.js
@@ -28,6 +28,7 @@ import CheckIfCertified from './CheckIfCertified';
 import GatherData from './GatherData';
 import SendRequest from './SendRequest';
 import QueryCode from './QueryCode';
+import SendConfirmation from './SendConfirmation';
 
 export default class SMSVerification extends Component {
   static contextTypes = {
@@ -63,7 +64,7 @@ export default class SMSVerification extends Component {
         title='verify your account via SMS'
         visible scroll
         current={ step }
-        steps={ ['Preparations', 'Enter Data', 'Send Request', 'Enter Code'] }
+        steps={ ['Preparations', 'Enter Data', 'Request', 'Enter Code', 'Confirm'] }
       >
         { this.renderStep() }
       </Modal>
@@ -82,7 +83,7 @@ export default class SMSVerification extends Component {
       />
     );
 
-    if (step === 3) {
+    if (step === 4) {
       return (
         <div>
           { cancel }
@@ -116,7 +117,9 @@ export default class SMSVerification extends Component {
     }
 
     const { step } = this.state;
-    if (step === 3) {
+    if (step === 4) {
+      return this.renderFifthStep();
+    } else if (step === 3) {
       return this.renderFourthStep();
     } else if (step === 2) {
       return this.renderThirdStep();
@@ -195,4 +198,18 @@ export default class SMSVerification extends Component {
       />
     );
   }
+
+  renderFifthStep () {
+    const { account } = this.props;
+    const { contract, data } = this.state;
+
+    return (
+      <SendConfirmation
+        account={ account } contract={ contract } data={ data }
+        onData={ this.onData }
+        onSuccess={ this.onDataIsValid }
+        onError={ this.onDataIsInvalid }
+      />
+    );
+  }
 }
diff --git a/js/src/modals/SMSVerification/SendConfirmation/index.js b/js/src/modals/SMSVerification/SendConfirmation/index.js
new file mode 100644
index 000000000..498a8572e
--- /dev/null
+++ b/js/src/modals/SMSVerification/SendConfirmation/index.js
@@ -0,0 +1,17 @@
+// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+export default from './sendConfirmation';
diff --git a/js/src/modals/SMSVerification/SendConfirmation/sendConfirmation.css b/js/src/modals/SMSVerification/SendConfirmation/sendConfirmation.css
new file mode 100644
index 000000000..ac956063c
--- /dev/null
+++ b/js/src/modals/SMSVerification/SendConfirmation/sendConfirmation.css
@@ -0,0 +1,19 @@
+/* Copyright 2015, 2016 Ethcore (UK) Ltd.
+/* This file is part of Parity.
+/*
+/* Parity is free software: you can redistribute it and/or modify
+/* it under the terms of the GNU General Public License as published by
+/* the Free Software Foundation, either version 3 of the License, or
+/* (at your option) any later version.
+/*
+/* Parity is distributed in the hope that it will be useful,
+/* but WITHOUT ANY WARRANTY; without even the implied warranty of
+/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+/* GNU General Public License for more details.
+/*
+/* You should have received a copy of the GNU General Public License
+/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+*/
+.spacing {
+  margin-top: 1.5em;
+}
diff --git a/js/src/modals/SMSVerification/SendConfirmation/sendConfirmation.js b/js/src/modals/SMSVerification/SendConfirmation/sendConfirmation.js
new file mode 100644
index 000000000..da0380965
--- /dev/null
+++ b/js/src/modals/SMSVerification/SendConfirmation/sendConfirmation.js
@@ -0,0 +1,145 @@
+// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+import React, { Component, PropTypes } from 'react';
+import TxHash from '../../../ui/TxHash';
+
+import { sha3 } from '../../../api/util/sha3';
+
+import styles from './sendConfirmation.css';
+
+const isValidReceipt = (receipt) => {
+  return receipt && receipt.blockNumber && receipt.blockNumber.gt(0);
+};
+
+// TODO: DRY up with ../SendRequest
+const waitForConfirmations = (api, tx, confirmations) => {
+  return new Promise((resolve, reject) => {
+    api.pollMethod('eth_getTransactionReceipt', tx, isValidReceipt)
+    .then((receipt) => {
+      let subscription;
+      api.subscribe('eth_blockNumber', (err, block) => {
+        if (err) {
+          reject(err);
+        } else if (block.minus(confirmations - 1).gte(receipt.blockNumber)) {
+          api.unsubscribe(subscription);
+          resolve();
+        }
+      })
+      .then((_subscription) => {
+        subscription = _subscription;
+      })
+      .catch(reject);
+    });
+  });
+};
+
+export default class SendConfirmation extends Component {
+  static contextTypes = {
+    api: PropTypes.object.isRequired
+  }
+
+  static propTypes = {
+    account: PropTypes.string.isRequired,
+    contract: PropTypes.object.isRequired,
+    data: PropTypes.object.isRequired,
+    onData: PropTypes.func.isRequired,
+    onSuccess: PropTypes.func.isRequired,
+    onError: PropTypes.func.isRequired
+  }
+
+  state = {
+    init: true,
+    step: 'init'
+  };
+
+  componentWillMount () {
+    const { init } = this.state;
+    if (init) {
+      this.send();
+      this.setState({ init: false });
+    }
+  }
+
+  render () {
+    const { step } = this.state;
+
+    if (step === 'error') {
+      return (<p>{ this.state.error }</p>);
+    }
+
+    if (step === 'pending') {
+      return (<p>Waiting for authorization by the Parity Signer.</p>);
+    }
+
+    if (step === 'posted') {
+      return (
+        <div className={ styles.centered }>
+          <TxHash hash={ this.props.data.txHash } maxConfirmations={ 3 } />
+          <p>Please keep this window open.</p>
+        </div>);
+    }
+
+    if (step === 'mined') {
+      return (<p>Congratulations, your account is verified!</p>);
+    }
+
+    return null;
+  }
+
+  send = () => {
+    const { api } = this.context;
+    const { account, contract, onData, onError, onSuccess } = this.props;
+
+    const { code } = this.props.data;
+    const token = sha3(code);
+
+    const confirm = contract.functions.find((fn) => fn.name === 'confirm');
+    const options = { from: account };
+    const values = [ token ];
+
+    confirm.estimateGas(options, values)
+      .then((gas) => {
+        options.gas = gas.mul(1.2).toFixed(0);
+        // TODO: show message
+        this.setState({ step: 'pending' });
+        return confirm.postTransaction(options, values);
+      })
+      .then((handle) => {
+        // TODO: The "request rejected" error doesn't have any property to
+        // distinguish it from other errors, so we can't give a meaningful error here.
+        return api.pollMethod('parity_checkRequest', handle);
+      })
+      .then((txHash) => {
+        onData({ txHash: txHash });
+        this.setState({ step: 'posted' });
+        return waitForConfirmations(api, txHash, 3);
+      })
+      .then(() => {
+        this.setState({ step: 'mined' });
+        onSuccess();
+      })
+      .catch((err) => {
+        console.error('failed to confirm sms verification', err);
+        onError(err);
+        this.setState({
+          step: 'error',
+          error: 'Failed to send the verification code: ' + err.message
+        });
+        // TODO: show message in SnackBar
+      });
+  }
+}
diff --git a/js/src/modals/SMSVerification/SendRequest/sendRequest.js b/js/src/modals/SMSVerification/SendRequest/sendRequest.js
index 641bd187a..7ca0c2410 100644
--- a/js/src/modals/SMSVerification/SendRequest/sendRequest.js
+++ b/js/src/modals/SMSVerification/SendRequest/sendRequest.js
@@ -25,6 +25,7 @@ const isValidReceipt = (receipt) => {
   return receipt && receipt.blockNumber && receipt.blockNumber.gt(0);
 };
 
+// TODO: DRY up with ../SendConfirmation
 const waitForConfirmations = (api, tx, confirmations) => {
   return new Promise((resolve, reject) => {
     api.pollMethod('eth_getTransactionReceipt', tx, isValidReceipt)

From 01cf88d71a3a64f909a9b5e6db3cc3cb6f0acc32 Mon Sep 17 00:00:00 2001
From: Jannis R <mail@jannisr.de>
Date: Wed, 9 Nov 2016 17:57:30 +0100
Subject: [PATCH 19/57] sms verification: merge step 1 & 2

---
 .../CheckIfCertified/checkIfCertified.css     | 27 ------
 .../CheckIfCertified/checkIfCertified.js      | 85 -------------------
 .../SMSVerification/CheckIfCertified/index.js | 17 ----
 .../SMSVerification/GatherData/gatherData.css | 11 +++
 .../SMSVerification/GatherData/gatherData.js  | 52 +++++++++++-
 .../modals/SMSVerification/SMSVerification.js | 29 ++-----
 6 files changed, 67 insertions(+), 154 deletions(-)
 delete mode 100644 js/src/modals/SMSVerification/CheckIfCertified/checkIfCertified.css
 delete mode 100644 js/src/modals/SMSVerification/CheckIfCertified/checkIfCertified.js
 delete mode 100644 js/src/modals/SMSVerification/CheckIfCertified/index.js

diff --git a/js/src/modals/SMSVerification/CheckIfCertified/checkIfCertified.css b/js/src/modals/SMSVerification/CheckIfCertified/checkIfCertified.css
deleted file mode 100644
index 13779b8f4..000000000
--- a/js/src/modals/SMSVerification/CheckIfCertified/checkIfCertified.css
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright 2015, 2016 Ethcore (UK) Ltd.
-/* This file is part of Parity.
-/*
-/* Parity is free software: you can redistribute it and/or modify
-/* it under the terms of the GNU General Public License as published by
-/* the Free Software Foundation, either version 3 of the License, or
-/* (at your option) any later version.
-/*
-/* Parity is distributed in the hope that it will be useful,
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-/* GNU General Public License for more details.
-/*
-/* You should have received a copy of the GNU General Public License
-/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.container {
-  display: flex;
-  align-items: center;
-}
-
-.message {
-  margin-top: 0;
-  margin-bottom: 0;
-  margin-left: .5em;
-}
diff --git a/js/src/modals/SMSVerification/CheckIfCertified/checkIfCertified.js b/js/src/modals/SMSVerification/CheckIfCertified/checkIfCertified.js
deleted file mode 100644
index b9048f6e7..000000000
--- a/js/src/modals/SMSVerification/CheckIfCertified/checkIfCertified.js
+++ /dev/null
@@ -1,85 +0,0 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import React, { Component, PropTypes } from 'react';
-import SuccessIcon from 'material-ui/svg-icons/navigation/check';
-import ErrorIcon from 'material-ui/svg-icons/alert/error-outline';
-
-import styles from './checkIfCertified.css';
-
-export default class CheckIfCertified extends Component {
-  static contextTypes = {
-    api: PropTypes.object.isRequired
-  }
-
-  static propTypes = {
-    account: PropTypes.string.isRequired,
-    contract: PropTypes.object.isRequired,
-    onIsCertified: PropTypes.func.isRequired,
-    onIsNotCertified: PropTypes.func.isRequired
-  }
-
-  state = {
-    pending: false,
-    isCertified: null
-  };
-
-  componentWillMount () {
-    const { pending } = this.state;
-    if (pending) {
-      return;
-    }
-    this.setState({ pending: true });
-
-    const { account, contract, onIsCertified, onIsNotCertified } = this.props;
-
-    contract.instance.certified.call({}, [account])
-      .then((isCertified) => {
-        this.setState({ isCertified, pending: false });
-        if (isCertified) {
-          onIsCertified();
-        } else {
-          onIsNotCertified();
-        }
-      })
-      .catch((err) => {
-        console.error('error checking if certified', err);
-      });
-  }
-
-  render () {
-    const { pending, isCertified } = this.state;
-
-    if (pending) {
-      return (<p className={ styles.message }>Checking if your account is verified…</p>);
-    }
-
-    if (isCertified) {
-      return (
-        <div className={ styles.container }>
-          <ErrorIcon />
-          <p className={ styles.message }>Your account is already verified.</p>
-        </div>
-      );
-    }
-    return (
-      <div className={ styles.container }>
-        <SuccessIcon />
-        <p className={ styles.message }>Your account is not verified yet.</p>
-      </div>
-    );
-  }
-}
diff --git a/js/src/modals/SMSVerification/CheckIfCertified/index.js b/js/src/modals/SMSVerification/CheckIfCertified/index.js
deleted file mode 100644
index 2577505e2..000000000
--- a/js/src/modals/SMSVerification/CheckIfCertified/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-export default from './checkIfCertified';
diff --git a/js/src/modals/SMSVerification/GatherData/gatherData.css b/js/src/modals/SMSVerification/GatherData/gatherData.css
index ac956063c..4bd7697fb 100644
--- a/js/src/modals/SMSVerification/GatherData/gatherData.css
+++ b/js/src/modals/SMSVerification/GatherData/gatherData.css
@@ -17,3 +17,14 @@
 .spacing {
   margin-top: 1.5em;
 }
+
+.container {
+  margin-top: .5em;
+  display: flex;
+  align-items: center;
+}
+.message {
+  margin-top: 0;
+  margin-bottom: 0;
+  margin-left: .5em;
+}
diff --git a/js/src/modals/SMSVerification/GatherData/gatherData.js b/js/src/modals/SMSVerification/GatherData/gatherData.js
index fd5d00791..44f0d5340 100644
--- a/js/src/modals/SMSVerification/GatherData/gatherData.js
+++ b/js/src/modals/SMSVerification/GatherData/gatherData.js
@@ -16,6 +16,9 @@
 
 import React, { Component, PropTypes } from 'react';
 import { Checkbox } from 'material-ui';
+import SuccessIcon from 'material-ui/svg-icons/navigation/check';
+import ErrorIcon from 'material-ui/svg-icons/alert/error-outline';
+
 import phone from 'phoneformat.js';
 
 import { fromWei } from '../../../api/util/wei';
@@ -24,7 +27,12 @@ import { Form, Input } from '../../../ui';
 import styles from './gatherData.css';
 
 export default class GatherData extends Component {
+  static contextTypes = {
+    api: PropTypes.object.isRequired
+  }
+
   static propTypes = {
+    account: PropTypes.string.isRequired,
     contract: PropTypes.object.isRequired,
     data: PropTypes.object.isRequired,
     onData: PropTypes.func.isRequired,
@@ -34,6 +42,7 @@ export default class GatherData extends Component {
 
   state = {
     init: true,
+    isCertified: null,
     numberIsValid: null,
     consentGiven: false
   };
@@ -41,8 +50,9 @@ export default class GatherData extends Component {
   componentWillMount () {
     const { init } = this.state;
     if (init) {
-      this.queryFee();
       this.setState({ init: false });
+      this.queryFee();
+      this.checkIfCertified();
     }
   }
 
@@ -53,6 +63,7 @@ export default class GatherData extends Component {
     return (
       <Form>
         <p>{ fee ? `The fee is ${fromWei(fee).toFixed(3)} ETH.` : 'Fetching the fee…' }</p>
+        { this.renderCertified() }
         <Input
           label={ 'phone number' }
           hint={ 'the sms will be sent to this number' }
@@ -69,6 +80,28 @@ export default class GatherData extends Component {
     );
   }
 
+  renderCertified () {
+    const { isCertified } = this.props.data;
+
+    if (isCertified) {
+      return (
+        <div className={ styles.container }>
+          <ErrorIcon />
+          <p className={ styles.message }>Your account is already verified.</p>
+        </div>
+      );
+    }
+    if (isCertified === false) {
+      return (
+        <div className={ styles.container }>
+          <SuccessIcon />
+          <p className={ styles.message }>Your account is not verified yet.</p>
+        </div>
+      );
+    }
+    return (<p className={ styles.message }>Checking if your account is verified…</p>);
+  }
+
   queryFee = () => {
     const { contract, onData } = this.props;
 
@@ -83,6 +116,19 @@ export default class GatherData extends Component {
     });
   }
 
+  checkIfCertified = () => {
+    const { account, contract, onData } = this.props;
+
+    contract.instance.certified.call({}, [account])
+    .then((isCertified) => {
+      onData({ isCertified });
+      this.onChange();
+    })
+    .catch((err) => {
+      console.error('error checking if certified', err);
+    });
+  }
+
   numberOnSubmit = (value) => {
     this.numberOnChange(null, value);
     this.props.onData({ number: value });
@@ -102,10 +148,10 @@ export default class GatherData extends Component {
   }
 
   onChange = () => {
-    const { fee } = this.props.data;
+    const { fee, isCertified } = this.props.data;
     const { numberIsValid, consentGiven } = this.state;
 
-    if (fee && numberIsValid && consentGiven) {
+    if (fee && numberIsValid && consentGiven && isCertified === false) {
       this.props.onDataIsValid();
     } else {
       this.props.onDataIsInvalid();
diff --git a/js/src/modals/SMSVerification/SMSVerification.js b/js/src/modals/SMSVerification/SMSVerification.js
index af3153fb9..e685c2c21 100644
--- a/js/src/modals/SMSVerification/SMSVerification.js
+++ b/js/src/modals/SMSVerification/SMSVerification.js
@@ -24,7 +24,6 @@ import { validateAddress, validateUint } from '../../util/validation';
 import ABI from '../../contracts/abi/sms-verification.json';
 const contract = '0xcE381B876A85A72303f7cA7b3a012f58F4CEEEeB';
 
-import CheckIfCertified from './CheckIfCertified';
 import GatherData from './GatherData';
 import SendRequest from './SendRequest';
 import QueryCode from './QueryCode';
@@ -64,7 +63,7 @@ export default class SMSVerification extends Component {
         title='verify your account via SMS'
         visible scroll
         current={ step }
-        steps={ ['Preparations', 'Enter Data', 'Request', 'Enter Code', 'Confirm'] }
+        steps={ ['Enter Data', 'Request', 'Enter Code', 'Confirm'] }
       >
         { this.renderStep() }
       </Modal>
@@ -83,7 +82,7 @@ export default class SMSVerification extends Component {
       />
     );
 
-    if (step === 4) {
+    if (step === 3) {
       return (
         <div>
           { cancel }
@@ -117,9 +116,7 @@ export default class SMSVerification extends Component {
     }
 
     const { step } = this.state;
-    if (step === 4) {
-      return this.renderFifthStep();
-    } else if (step === 3) {
+    if (step === 3) {
       return this.renderFourthStep();
     } else if (step === 2) {
       return this.renderThirdStep();
@@ -148,23 +145,11 @@ export default class SMSVerification extends Component {
 
   renderFirstStep () {
     const { account } = this.props;
-    const { contract } = this.state;
-
-    return (
-      <CheckIfCertified
-        account={ account } contract={ contract }
-        onIsCertified={ this.onDataIsInvalid }
-        onIsNotCertified={ this.onDataIsValid }
-      />
-    );
-  }
-
-  renderSecondStep () {
     const { contract, data } = this.state;
 
     return (
       <GatherData
-        contract={ contract } data={ data }
+        account={ account } contract={ contract } data={ data }
         onData={ this.onData }
         onDataIsValid={ this.onDataIsValid }
         onDataIsInvalid={ this.onDataIsInvalid }
@@ -172,7 +157,7 @@ export default class SMSVerification extends Component {
     );
   }
 
-  renderThirdStep () {
+  renderSecondStep () {
     const { account } = this.props;
     const { contract, data } = this.state;
 
@@ -186,7 +171,7 @@ export default class SMSVerification extends Component {
     );
   }
 
-  renderFourthStep () {
+  renderThirdStep () {
     const { data } = this.state;
 
     return (
@@ -199,7 +184,7 @@ export default class SMSVerification extends Component {
     );
   }
 
-  renderFifthStep () {
+  renderFourthStep () {
     const { account } = this.props;
     const { contract, data } = this.state;
 

From 8028c0fd652b2cd74269594a1487b657f8d0960e Mon Sep 17 00:00:00 2001
From: Jannis R <mail@jannisr.de>
Date: Wed, 9 Nov 2016 18:42:21 +0100
Subject: [PATCH 20/57] sms verification: check if already requested

---
 .../SMSVerification/GatherData/gatherData.js  | 47 ++++++++++++++++++-
 .../SendRequest/sendRequest.js                | 41 +++++++++-------
 2 files changed, 68 insertions(+), 20 deletions(-)

diff --git a/js/src/modals/SMSVerification/GatherData/gatherData.js b/js/src/modals/SMSVerification/GatherData/gatherData.js
index 44f0d5340..0a293e650 100644
--- a/js/src/modals/SMSVerification/GatherData/gatherData.js
+++ b/js/src/modals/SMSVerification/GatherData/gatherData.js
@@ -17,7 +17,7 @@
 import React, { Component, PropTypes } from 'react';
 import { Checkbox } from 'material-ui';
 import SuccessIcon from 'material-ui/svg-icons/navigation/check';
-import ErrorIcon from 'material-ui/svg-icons/alert/error-outline';
+import ErrorIcon from 'material-ui/svg-icons/navigation/close';
 
 import phone from 'phoneformat.js';
 
@@ -43,6 +43,7 @@ export default class GatherData extends Component {
   state = {
     init: true,
     isCertified: null,
+    hasRequested: null,
     numberIsValid: null,
     consentGiven: false
   };
@@ -53,6 +54,7 @@ export default class GatherData extends Component {
       this.setState({ init: false });
       this.queryFee();
       this.checkIfCertified();
+      this.checkIfRequested();
     }
   }
 
@@ -64,6 +66,7 @@ export default class GatherData extends Component {
       <Form>
         <p>{ fee ? `The fee is ${fromWei(fee).toFixed(3)} ETH.` : 'Fetching the fee…' }</p>
         { this.renderCertified() }
+        { this.renderRequested() }
         <Input
           label={ 'phone number' }
           hint={ 'the sms will be sent to this number' }
@@ -102,6 +105,28 @@ export default class GatherData extends Component {
     return (<p className={ styles.message }>Checking if your account is verified…</p>);
   }
 
+  renderRequested () {
+    const { hasRequested } = this.props.data;
+
+    if (hasRequested) {
+      return (
+        <div className={ styles.container }>
+          <ErrorIcon />
+          <p className={ styles.message }>You already requested verification.</p>
+        </div>
+      );
+    }
+    if (hasRequested === false) {
+      return (
+        <div className={ styles.container }>
+          <SuccessIcon />
+          <p className={ styles.message }>You did not request verification yet.</p>
+        </div>
+      );
+    }
+    return (<p className={ styles.message }>Checking if you requested verification…</p>);
+  }
+
   queryFee = () => {
     const { contract, onData } = this.props;
 
@@ -129,6 +154,24 @@ export default class GatherData extends Component {
     });
   }
 
+  checkIfRequested = () => {
+    const { account, contract, onData } = this.props;
+
+    contract.subscribe('Requested', {
+      fromBlock: 0, toBlock: 'pending',
+      // limit: 1
+    }, (err, logs) => {
+      if (err) {
+        return console.error('error checking if requested', err);
+      }
+      const hasRequested = logs.some((l) => {
+        return l.type === 'mined' && l.params.who && l.params.who.value === account;
+      });
+      onData({ hasRequested });
+      this.onChange();
+    });
+  }
+
   numberOnSubmit = (value) => {
     this.numberOnChange(null, value);
     this.props.onData({ number: value });
@@ -148,7 +191,7 @@ export default class GatherData extends Component {
   }
 
   onChange = () => {
-    const { fee, isCertified } = this.props.data;
+    const { fee, isCertified, hasRequested } = this.props.data;
     const { numberIsValid, consentGiven } = this.state;
 
     if (fee && numberIsValid && consentGiven && isCertified === false) {
diff --git a/js/src/modals/SMSVerification/SendRequest/sendRequest.js b/js/src/modals/SMSVerification/SendRequest/sendRequest.js
index 7ca0c2410..e43464949 100644
--- a/js/src/modals/SMSVerification/SendRequest/sendRequest.js
+++ b/js/src/modals/SMSVerification/SendRequest/sendRequest.js
@@ -122,28 +122,33 @@ export default class SendRequest extends Component {
   send = () => {
     const { api } = this.context;
     const { account, contract, onData, onError, onSuccess } = this.props;
-    const { fee, number } = this.props.data;
+    const { fee, number, hasRequested } = this.props.data;
 
     const request = contract.functions.find((fn) => fn.name === 'request');
     const options = { from: account, value: fee.toString() };
 
-    request.estimateGas(options, [])
-      .then((gas) => {
-        options.gas = gas.mul(1.2).toFixed(0);
-        // TODO: show message
-        this.setState({ step: 'pending' });
-        return request.postTransaction(options, []);
-      })
-      .then((handle) => {
-        // TODO: The "request rejected" error doesn't have any property to
-        // distinguish it from other errors, so we can't give a meaningful error here.
-        return api.pollMethod('parity_checkRequest', handle);
-      })
-      .then((txHash) => {
-        onData({ txHash: txHash });
-        this.setState({ step: 'posted' });
-        return waitForConfirmations(api, txHash, 3);
-      })
+    let chain = Promise.resolve();
+    if (!hasRequested) {
+      chain = request.estimateGas(options, [])
+        .then((gas) => {
+          options.gas = gas.mul(1.2).toFixed(0);
+          // TODO: show message
+          this.setState({ step: 'pending' });
+          return request.postTransaction(options, []);
+        })
+        .then((handle) => {
+          // TODO: The "request rejected" error doesn't have any property to
+          // distinguish it from other errors, so we can't give a meaningful error here.
+          return api.pollMethod('parity_checkRequest', handle);
+        })
+        .then((txHash) => {
+          onData({ txHash: txHash });
+          this.setState({ step: 'posted' });
+          return waitForConfirmations(api, txHash, 3);
+        });
+    }
+
+    chain
       .then(() => {
         this.setState({ step: 'mined' });
         return postToVerificationServer({ number, address: account });

From cde9f454ebb78af3d0ff4b22e3e129632e62a6dd Mon Sep 17 00:00:00 2001
From: Jannis R <mail@jannisr.de>
Date: Wed, 9 Nov 2016 19:04:13 +0100
Subject: [PATCH 21/57] sms verification: polish UI

---
 .../SMSVerification/GatherData/gatherData.js  | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/js/src/modals/SMSVerification/GatherData/gatherData.js b/js/src/modals/SMSVerification/GatherData/gatherData.js
index 0a293e650..9eb6e6883 100644
--- a/js/src/modals/SMSVerification/GatherData/gatherData.js
+++ b/js/src/modals/SMSVerification/GatherData/gatherData.js
@@ -16,6 +16,7 @@
 
 import React, { Component, PropTypes } from 'react';
 import { Checkbox } from 'material-ui';
+import InfoIcon from 'material-ui/svg-icons/action/info-outline';
 import SuccessIcon from 'material-ui/svg-icons/navigation/check';
 import ErrorIcon from 'material-ui/svg-icons/navigation/close';
 
@@ -59,12 +60,12 @@ export default class GatherData extends Component {
   }
 
   render () {
-    const { fee } = this.props.data;
     const { numberIsValid } = this.state;
 
+    // TODO: proper legal text
     return (
       <Form>
-        <p>{ fee ? `The fee is ${fromWei(fee).toFixed(3)} ETH.` : 'Fetching the fee…' }</p>
+        { this.renderFee() }
         { this.renderCertified() }
         { this.renderRequested() }
         <Input
@@ -83,6 +84,20 @@ export default class GatherData extends Component {
     );
   }
 
+  renderFee () {
+    const { fee } = this.props.data;
+
+    if (!fee) {
+      return (<p>Fetching the fee…</p>);
+    }
+    return (
+      <div className={ styles.container }>
+        <InfoIcon />
+        <p className={ styles.message }>The fee is { fromWei(fee).toFixed(3) } ETH.</p>
+      </div>
+    );
+  }
+
   renderCertified () {
     const { isCertified } = this.props.data;
 

From ac80276ad84e7649ce67e5aa8e201adf30f7c5c6 Mon Sep 17 00:00:00 2001
From: Jannis R <mail@jannisr.de>
Date: Thu, 10 Nov 2016 13:37:32 +0100
Subject: [PATCH 22/57] sms verification: refactor checks & confirmation

---
 .../SMSVerification/GatherData/gatherData.js  | 35 +++++++---------
 .../SendConfirmation/sendConfirmation.js      | 27 +-----------
 .../SendRequest/sendRequest.js                | 27 +-----------
 .../SMSVerification/check-if-requested.js     | 32 ++++++++++++++
 .../SMSVerification/check-if-verified.js      | 21 ++++++++++
 .../SMSVerification/wait-for-confirmations.js | 42 +++++++++++++++++++
 6 files changed, 113 insertions(+), 71 deletions(-)
 create mode 100644 js/src/modals/SMSVerification/check-if-requested.js
 create mode 100644 js/src/modals/SMSVerification/check-if-verified.js
 create mode 100644 js/src/modals/SMSVerification/wait-for-confirmations.js

diff --git a/js/src/modals/SMSVerification/GatherData/gatherData.js b/js/src/modals/SMSVerification/GatherData/gatherData.js
index 9eb6e6883..9b55fbfe5 100644
--- a/js/src/modals/SMSVerification/GatherData/gatherData.js
+++ b/js/src/modals/SMSVerification/GatherData/gatherData.js
@@ -24,6 +24,8 @@ import phone from 'phoneformat.js';
 
 import { fromWei } from '../../../api/util/wei';
 import { Form, Input } from '../../../ui';
+import checkIfVerified from '../check-if-verified';
+import checkIfRequested from '../check-if-requested';
 
 import styles from './gatherData.css';
 
@@ -43,7 +45,7 @@ export default class GatherData extends Component {
 
   state = {
     init: true,
-    isCertified: null,
+    isVerified: null,
     hasRequested: null,
     numberIsValid: null,
     consentGiven: false
@@ -99,9 +101,9 @@ export default class GatherData extends Component {
   }
 
   renderCertified () {
-    const { isCertified } = this.props.data;
+    const { isVerified } = this.props.data;
 
-    if (isCertified) {
+    if (isVerified) {
       return (
         <div className={ styles.container }>
           <ErrorIcon />
@@ -109,7 +111,7 @@ export default class GatherData extends Component {
         </div>
       );
     }
-    if (isCertified === false) {
+    if (isVerified === false) {
       return (
         <div className={ styles.container }>
           <SuccessIcon />
@@ -159,9 +161,9 @@ export default class GatherData extends Component {
   checkIfCertified = () => {
     const { account, contract, onData } = this.props;
 
-    contract.instance.certified.call({}, [account])
-    .then((isCertified) => {
-      onData({ isCertified });
+    checkIfVerified(contract, account)
+    .then((isVerified) => {
+      onData({ isVerified });
       this.onChange();
     })
     .catch((err) => {
@@ -172,18 +174,13 @@ export default class GatherData extends Component {
   checkIfRequested = () => {
     const { account, contract, onData } = this.props;
 
-    contract.subscribe('Requested', {
-      fromBlock: 0, toBlock: 'pending',
-      // limit: 1
-    }, (err, logs) => {
-      if (err) {
-        return console.error('error checking if requested', err);
-      }
-      const hasRequested = logs.some((l) => {
-        return l.type === 'mined' && l.params.who && l.params.who.value === account;
-      });
+    checkIfRequested(contract, account)
+    .then((hasRequested) => {
       onData({ hasRequested });
       this.onChange();
+    })
+    .catch((err) => {
+      console.error('error checking if requested', err);
     });
   }
 
@@ -206,10 +203,10 @@ export default class GatherData extends Component {
   }
 
   onChange = () => {
-    const { fee, isCertified, hasRequested } = this.props.data;
+    const { fee, isVerified, hasRequested } = this.props.data;
     const { numberIsValid, consentGiven } = this.state;
 
-    if (fee && numberIsValid && consentGiven && isCertified === false) {
+    if (fee && numberIsValid && consentGiven && isVerified === false) {
       this.props.onDataIsValid();
     } else {
       this.props.onDataIsInvalid();
diff --git a/js/src/modals/SMSVerification/SendConfirmation/sendConfirmation.js b/js/src/modals/SMSVerification/SendConfirmation/sendConfirmation.js
index da0380965..7e7880929 100644
--- a/js/src/modals/SMSVerification/SendConfirmation/sendConfirmation.js
+++ b/js/src/modals/SMSVerification/SendConfirmation/sendConfirmation.js
@@ -18,35 +18,10 @@ import React, { Component, PropTypes } from 'react';
 import TxHash from '../../../ui/TxHash';
 
 import { sha3 } from '../../../api/util/sha3';
+import waitForConfirmations from '../wait-for-confirmations';
 
 import styles from './sendConfirmation.css';
 
-const isValidReceipt = (receipt) => {
-  return receipt && receipt.blockNumber && receipt.blockNumber.gt(0);
-};
-
-// TODO: DRY up with ../SendRequest
-const waitForConfirmations = (api, tx, confirmations) => {
-  return new Promise((resolve, reject) => {
-    api.pollMethod('eth_getTransactionReceipt', tx, isValidReceipt)
-    .then((receipt) => {
-      let subscription;
-      api.subscribe('eth_blockNumber', (err, block) => {
-        if (err) {
-          reject(err);
-        } else if (block.minus(confirmations - 1).gte(receipt.blockNumber)) {
-          api.unsubscribe(subscription);
-          resolve();
-        }
-      })
-      .then((_subscription) => {
-        subscription = _subscription;
-      })
-      .catch(reject);
-    });
-  });
-};
-
 export default class SendConfirmation extends Component {
   static contextTypes = {
     api: PropTypes.object.isRequired
diff --git a/js/src/modals/SMSVerification/SendRequest/sendRequest.js b/js/src/modals/SMSVerification/SendRequest/sendRequest.js
index e43464949..0594ebbf1 100644
--- a/js/src/modals/SMSVerification/SendRequest/sendRequest.js
+++ b/js/src/modals/SMSVerification/SendRequest/sendRequest.js
@@ -18,35 +18,10 @@ import React, { Component, PropTypes } from 'react';
 import qs from 'querystring';
 
 import TxHash from '../../../ui/TxHash';
+import waitForConfirmations from '../wait-for-confirmations';
 
 import styles from './sendRequest.css';
 
-const isValidReceipt = (receipt) => {
-  return receipt && receipt.blockNumber && receipt.blockNumber.gt(0);
-};
-
-// TODO: DRY up with ../SendConfirmation
-const waitForConfirmations = (api, tx, confirmations) => {
-  return new Promise((resolve, reject) => {
-    api.pollMethod('eth_getTransactionReceipt', tx, isValidReceipt)
-    .then((receipt) => {
-      let subscription;
-      api.subscribe('eth_blockNumber', (err, block) => {
-        if (err) {
-          reject(err);
-        } else if (block.minus(confirmations - 1).gte(receipt.blockNumber)) {
-          api.unsubscribe(subscription);
-          resolve();
-        }
-      })
-      .then((_subscription) => {
-        subscription = _subscription;
-      })
-      .catch(reject);
-    });
-  });
-};
-
 const postToVerificationServer = (query) => {
   query = qs.stringify(query);
   return fetch('https://sms-verification.parity.io/?' + query, {
diff --git a/js/src/modals/SMSVerification/check-if-requested.js b/js/src/modals/SMSVerification/check-if-requested.js
new file mode 100644
index 000000000..8f1d8cc57
--- /dev/null
+++ b/js/src/modals/SMSVerification/check-if-requested.js
@@ -0,0 +1,32 @@
+// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+const checkIfRequested = (contract, account) => {
+  return new Promise((resolve, reject) => {
+    contract.subscribe('Requested', {
+      fromBlock: 0, toBlock: 'pending'
+    }, (err, logs) => {
+      if (err) {
+        return reject(err);
+      }
+      resolve(logs.some((l) => {
+        return l.type === 'mined' && l.params.who && l.params.who.value === account;
+      }));
+    });
+  });
+};
+
+export default checkIfRequested;
diff --git a/js/src/modals/SMSVerification/check-if-verified.js b/js/src/modals/SMSVerification/check-if-verified.js
new file mode 100644
index 000000000..f45b0caba
--- /dev/null
+++ b/js/src/modals/SMSVerification/check-if-verified.js
@@ -0,0 +1,21 @@
+// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+const checkIfVerified = (contract, account) => {
+  return contract.instance.certified.call({}, [account]);
+};
+
+export default checkIfVerified;
diff --git a/js/src/modals/SMSVerification/wait-for-confirmations.js b/js/src/modals/SMSVerification/wait-for-confirmations.js
new file mode 100644
index 000000000..e99d3d173
--- /dev/null
+++ b/js/src/modals/SMSVerification/wait-for-confirmations.js
@@ -0,0 +1,42 @@
+// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+const isValidReceipt = (receipt) => {
+  return receipt && receipt.blockNumber && receipt.blockNumber.gt(0);
+};
+
+const waitForConfirmations = (api, tx, confirmations) => {
+  return new Promise((resolve, reject) => {
+    api.pollMethod('eth_getTransactionReceipt', tx, isValidReceipt)
+    .then((receipt) => {
+      let subscription;
+      api.subscribe('eth_blockNumber', (err, block) => {
+        if (err) {
+          reject(err);
+        } else if (block.minus(confirmations - 1).gte(receipt.blockNumber)) {
+          api.unsubscribe(subscription);
+          resolve();
+        }
+      })
+      .then((_subscription) => {
+        subscription = _subscription;
+      })
+      .catch(reject);
+    });
+  });
+};
+
+export default waitForConfirmations;

From 2309e53fe638fa415dc0e3f0f3fc1b02e96a16a5 Mon Sep 17 00:00:00 2001
From: Jannis R <mail@jannisr.de>
Date: Thu, 10 Nov 2016 13:54:09 +0100
Subject: [PATCH 23/57] sms verification: polish UI, linting issues :shirt:

---
 .../SMSVerification/GatherData/gatherData.js       | 14 ++++++++++----
 .../SendConfirmation/sendConfirmation.css          |  5 +++--
 .../SMSVerification/SendRequest/sendRequest.css    |  1 +
 js/src/views/Account/account.js                    |  2 +-
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/js/src/modals/SMSVerification/GatherData/gatherData.js b/js/src/modals/SMSVerification/GatherData/gatherData.js
index 9b55fbfe5..72c0c3061 100644
--- a/js/src/modals/SMSVerification/GatherData/gatherData.js
+++ b/js/src/modals/SMSVerification/GatherData/gatherData.js
@@ -45,8 +45,6 @@ export default class GatherData extends Component {
 
   state = {
     init: true,
-    isVerified: null,
-    hasRequested: null,
     numberIsValid: null,
     consentGiven: false
   };
@@ -63,6 +61,7 @@ export default class GatherData extends Component {
 
   render () {
     const { numberIsValid } = this.state;
+    const { isVerified, hasRequested } = this.props.data;
 
     // TODO: proper legal text
     return (
@@ -74,12 +73,14 @@ export default class GatherData extends Component {
           label={ 'phone number' }
           hint={ 'the sms will be sent to this number' }
           error={ numberIsValid ? null : 'invalid number' }
+          disabled={ isVerified || hasRequested }
           onChange={ this.numberOnChange }
           onSubmit={ this.numberOnSubmit }
         />
         <Checkbox
           className={ styles.spacing }
           label={ 'I agree that my number will be stored.' }
+          disabled={ isVerified || hasRequested }
           onCheck={ this.consentOnChange }
         />
       </Form>
@@ -123,7 +124,12 @@ export default class GatherData extends Component {
   }
 
   renderRequested () {
-    const { hasRequested } = this.props.data;
+    const { isVerified, hasRequested } = this.props.data;
+
+    // If the account is verified, don't show that it has requested verification.
+    if (isVerified) {
+      return null;
+    }
 
     if (hasRequested) {
       return (
@@ -203,7 +209,7 @@ export default class GatherData extends Component {
   }
 
   onChange = () => {
-    const { fee, isVerified, hasRequested } = this.props.data;
+    const { fee, isVerified } = this.props.data;
     const { numberIsValid, consentGiven } = this.state;
 
     if (fee && numberIsValid && consentGiven && isVerified === false) {
diff --git a/js/src/modals/SMSVerification/SendConfirmation/sendConfirmation.css b/js/src/modals/SMSVerification/SendConfirmation/sendConfirmation.css
index ac956063c..d2395f24d 100644
--- a/js/src/modals/SMSVerification/SendConfirmation/sendConfirmation.css
+++ b/js/src/modals/SMSVerification/SendConfirmation/sendConfirmation.css
@@ -14,6 +14,7 @@
 /* You should have received a copy of the GNU General Public License
 /* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 */
-.spacing {
-  margin-top: 1.5em;
+
+.centered {
+  text-align: center;
 }
diff --git a/js/src/modals/SMSVerification/SendRequest/sendRequest.css b/js/src/modals/SMSVerification/SendRequest/sendRequest.css
index 563bf01ad..d2395f24d 100644
--- a/js/src/modals/SMSVerification/SendRequest/sendRequest.css
+++ b/js/src/modals/SMSVerification/SendRequest/sendRequest.css
@@ -14,6 +14,7 @@
 /* You should have received a copy of the GNU General Public License
 /* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 */
+
 .centered {
   text-align: center;
 }
diff --git a/js/src/views/Account/account.js b/js/src/views/Account/account.js
index 8ddd2d989..24c0b44cb 100644
--- a/js/src/views/Account/account.js
+++ b/js/src/views/Account/account.js
@@ -105,7 +105,7 @@ class Account extends Component {
       <Button
         key='sms-verification'
         icon={ <VerifyIcon /> }
-        label='Verify via SMS'
+        label='Verify'
         onClick={ this.openVerification } />,
       <Button
         key='editmeta'

From afdda48ab57280afd4a4518b4b030ed346c6b912 Mon Sep 17 00:00:00 2001
From: Jannis R <mail@jannisr.de>
Date: Thu, 10 Nov 2016 14:31:30 +0100
Subject: [PATCH 24/57] sms verification: polish UI

This introduces another "Done" step, making clear the process has finished.

Also, steps 2 ("Request") and 4 ("Confirm") now have a pending indicator.
---
 js/src/modals/SMSVerification/Done/done.css   | 30 ++++++++++++++
 js/src/modals/SMSVerification/Done/done.js    | 39 +++++++++++++++++++
 js/src/modals/SMSVerification/Done/index.js   | 17 ++++++++
 .../SMSVerification/GatherData/gatherData.css |  5 +++
 .../SMSVerification/GatherData/gatherData.js  |  8 +++-
 .../SMSVerification/QueryCode/queryCode.js    |  3 +-
 .../modals/SMSVerification/SMSVerification.js | 21 ++++++++--
 .../SendConfirmation/sendConfirmation.js      | 13 +++----
 .../SendRequest/sendRequest.js                | 12 +++---
 9 files changed, 127 insertions(+), 21 deletions(-)
 create mode 100644 js/src/modals/SMSVerification/Done/done.css
 create mode 100644 js/src/modals/SMSVerification/Done/done.js
 create mode 100644 js/src/modals/SMSVerification/Done/index.js

diff --git a/js/src/modals/SMSVerification/Done/done.css b/js/src/modals/SMSVerification/Done/done.css
new file mode 100644
index 000000000..4bd7697fb
--- /dev/null
+++ b/js/src/modals/SMSVerification/Done/done.css
@@ -0,0 +1,30 @@
+/* Copyright 2015, 2016 Ethcore (UK) Ltd.
+/* This file is part of Parity.
+/*
+/* Parity is free software: you can redistribute it and/or modify
+/* it under the terms of the GNU General Public License as published by
+/* the Free Software Foundation, either version 3 of the License, or
+/* (at your option) any later version.
+/*
+/* Parity is distributed in the hope that it will be useful,
+/* but WITHOUT ANY WARRANTY; without even the implied warranty of
+/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+/* GNU General Public License for more details.
+/*
+/* You should have received a copy of the GNU General Public License
+/* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+*/
+.spacing {
+  margin-top: 1.5em;
+}
+
+.container {
+  margin-top: .5em;
+  display: flex;
+  align-items: center;
+}
+.message {
+  margin-top: 0;
+  margin-bottom: 0;
+  margin-left: .5em;
+}
diff --git a/js/src/modals/SMSVerification/Done/done.js b/js/src/modals/SMSVerification/Done/done.js
new file mode 100644
index 000000000..0af05ad41
--- /dev/null
+++ b/js/src/modals/SMSVerification/Done/done.js
@@ -0,0 +1,39 @@
+// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+import React, { Component, PropTypes } from 'react';
+import SuccessIcon from 'material-ui/svg-icons/navigation/check';
+
+import styles from './done.css';
+
+export default class Done extends Component {
+  static propTypes = {
+    onSuccess: PropTypes.func.isRequired
+  }
+
+  componentWillMount () {
+    this.props.onSuccess();
+  }
+
+  render () {
+    return (
+      <div className={ styles.container }>
+        <SuccessIcon />
+        <p className={ styles.message }>Congratulations, your account is verified!</p>
+      </div>
+    );
+  }
+}
diff --git a/js/src/modals/SMSVerification/Done/index.js b/js/src/modals/SMSVerification/Done/index.js
new file mode 100644
index 000000000..549306dbd
--- /dev/null
+++ b/js/src/modals/SMSVerification/Done/index.js
@@ -0,0 +1,17 @@
+// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+export default from './done';
diff --git a/js/src/modals/SMSVerification/GatherData/gatherData.css b/js/src/modals/SMSVerification/GatherData/gatherData.css
index 4bd7697fb..0c501c223 100644
--- a/js/src/modals/SMSVerification/GatherData/gatherData.css
+++ b/js/src/modals/SMSVerification/GatherData/gatherData.css
@@ -14,6 +14,11 @@
 /* You should have received a copy of the GNU General Public License
 /* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 */
+
+.list li {
+  padding: .1em 0;
+}
+
 .spacing {
   margin-top: 1.5em;
 }
diff --git a/js/src/modals/SMSVerification/GatherData/gatherData.js b/js/src/modals/SMSVerification/GatherData/gatherData.js
index 72c0c3061..528aaf1d1 100644
--- a/js/src/modals/SMSVerification/GatherData/gatherData.js
+++ b/js/src/modals/SMSVerification/GatherData/gatherData.js
@@ -66,12 +66,18 @@ export default class GatherData extends Component {
     // TODO: proper legal text
     return (
       <Form>
+        <p>The following steps will let you prove that you control both an account and a phone number.</p>
+        <ol className={ styles.list }>
+          <li>You send a verification request to a specific contract.</li>
+          <li>Our server puts a puzzle into this contract.</li>
+          <li>The code you receive via SMS is the solution to this puzzle.</li>
+        </ol>
         { this.renderFee() }
         { this.renderCertified() }
         { this.renderRequested() }
         <Input
           label={ 'phone number' }
-          hint={ 'the sms will be sent to this number' }
+          hint={ 'the SMS will be sent to this number' }
           error={ numberIsValid ? null : 'invalid number' }
           disabled={ isVerified || hasRequested }
           onChange={ this.numberOnChange }
diff --git a/js/src/modals/SMSVerification/QueryCode/queryCode.js b/js/src/modals/SMSVerification/QueryCode/queryCode.js
index b85c6f5e5..08d9089e3 100644
--- a/js/src/modals/SMSVerification/QueryCode/queryCode.js
+++ b/js/src/modals/SMSVerification/QueryCode/queryCode.js
@@ -31,10 +31,11 @@ export default class QueryCode extends Component {
   }
 
   render () {
-    const { code } = this.props.data;
+    const { number, code } = this.props.data;
 
     return (
       <Form>
+        <p>The verification code has been sent to { number }.</p>
         <Input
           label={ 'verification code' }
           hint={ 'Enter the code you received via SMS.' }
diff --git a/js/src/modals/SMSVerification/SMSVerification.js b/js/src/modals/SMSVerification/SMSVerification.js
index e685c2c21..1e20ea705 100644
--- a/js/src/modals/SMSVerification/SMSVerification.js
+++ b/js/src/modals/SMSVerification/SMSVerification.js
@@ -28,6 +28,7 @@ import GatherData from './GatherData';
 import SendRequest from './SendRequest';
 import QueryCode from './QueryCode';
 import SendConfirmation from './SendConfirmation';
+import Done from './Done';
 
 export default class SMSVerification extends Component {
   static contextTypes = {
@@ -63,7 +64,8 @@ export default class SMSVerification extends Component {
         title='verify your account via SMS'
         visible scroll
         current={ step }
-        steps={ ['Enter Data', 'Request', 'Enter Code', 'Confirm'] }
+        steps={ ['Enter Data', 'Request', 'Enter Code', 'Confirm', 'Done!'] }
+        waiting={ [ 1, 3 ] }
       >
         { this.renderStep() }
       </Modal>
@@ -82,7 +84,7 @@ export default class SMSVerification extends Component {
       />
     );
 
-    if (step === 3) {
+    if (step === 4) {
       return (
         <div>
           { cancel }
@@ -116,7 +118,9 @@ export default class SMSVerification extends Component {
     }
 
     const { step } = this.state;
-    if (step === 3) {
+    if (step === 4) {
+      return this.renderFifthStep();
+    } else if (step === 3) {
       return this.renderFourthStep();
     } else if (step === 2) {
       return this.renderThirdStep();
@@ -140,7 +144,10 @@ export default class SMSVerification extends Component {
   }
 
   next = () => {
-    this.setState({ step: this.state.step + 1, stepIsValid: false });
+    const { stepIsValid } = this.state;
+    if (stepIsValid) {
+      this.setState({ step: this.state.step + 1, stepIsValid: false });
+    }
   }
 
   renderFirstStep () {
@@ -167,6 +174,7 @@ export default class SMSVerification extends Component {
         onData={ this.onData }
         onSuccess={ this.onDataIsValid }
         onError={ this.onDataIsInvalid }
+        nextStep={ this.next }
       />
     );
   }
@@ -194,7 +202,12 @@ export default class SMSVerification extends Component {
         onData={ this.onData }
         onSuccess={ this.onDataIsValid }
         onError={ this.onDataIsInvalid }
+        nextStep={ this.next }
       />
     );
   }
+
+  renderFifthStep () {
+    return (<Done onSuccess={ this.onDataIsValid } />);
+  }
 }
diff --git a/js/src/modals/SMSVerification/SendConfirmation/sendConfirmation.js b/js/src/modals/SMSVerification/SendConfirmation/sendConfirmation.js
index 7e7880929..4f044d51c 100644
--- a/js/src/modals/SMSVerification/SendConfirmation/sendConfirmation.js
+++ b/js/src/modals/SMSVerification/SendConfirmation/sendConfirmation.js
@@ -33,7 +33,8 @@ export default class SendConfirmation extends Component {
     data: PropTypes.object.isRequired,
     onData: PropTypes.func.isRequired,
     onSuccess: PropTypes.func.isRequired,
-    onError: PropTypes.func.isRequired
+    onError: PropTypes.func.isRequired,
+    nextStep: PropTypes.func.isRequired
   }
 
   state = {
@@ -57,7 +58,7 @@ export default class SendConfirmation extends Component {
     }
 
     if (step === 'pending') {
-      return (<p>Waiting for authorization by the Parity Signer.</p>);
+      return (<p>The verification code will be sent to the contract. Please authorize this using the Parity Signer.</p>);
     }
 
     if (step === 'posted') {
@@ -68,16 +69,12 @@ export default class SendConfirmation extends Component {
         </div>);
     }
 
-    if (step === 'mined') {
-      return (<p>Congratulations, your account is verified!</p>);
-    }
-
     return null;
   }
 
   send = () => {
     const { api } = this.context;
-    const { account, contract, onData, onError, onSuccess } = this.props;
+    const { account, contract, onData, onError, onSuccess, nextStep } = this.props;
 
     const { code } = this.props.data;
     const token = sha3(code);
@@ -104,8 +101,8 @@ export default class SendConfirmation extends Component {
         return waitForConfirmations(api, txHash, 3);
       })
       .then(() => {
-        this.setState({ step: 'mined' });
         onSuccess();
+        nextStep();
       })
       .catch((err) => {
         console.error('failed to confirm sms verification', err);
diff --git a/js/src/modals/SMSVerification/SendRequest/sendRequest.js b/js/src/modals/SMSVerification/SendRequest/sendRequest.js
index 0594ebbf1..056728116 100644
--- a/js/src/modals/SMSVerification/SendRequest/sendRequest.js
+++ b/js/src/modals/SMSVerification/SendRequest/sendRequest.js
@@ -48,7 +48,8 @@ export default class SendRequest extends Component {
     data: PropTypes.object.isRequired,
     onData: PropTypes.func.isRequired,
     onSuccess: PropTypes.func.isRequired,
-    onError: PropTypes.func.isRequired
+    onError: PropTypes.func.isRequired,
+    nextStep: PropTypes.func.isRequired
   }
 
   state = {
@@ -72,7 +73,7 @@ export default class SendRequest extends Component {
     }
 
     if (step === 'pending') {
-      return (<p>Waiting for authorization by the Parity Signer.</p>);
+      return (<p>A verification request will be sent to the contract. Please authorize this using the Parity Signer.</p>);
     }
 
     if (step === 'posted') {
@@ -87,16 +88,12 @@ export default class SendRequest extends Component {
       return (<p>Requesting an SMS from the Parity server.</p>);
     }
 
-    if (step === 'sms-sent') {
-      return (<p>The verification code has been sent to { this.props.data.number }.</p>);
-    }
-
     return null;
   }
 
   send = () => {
     const { api } = this.context;
-    const { account, contract, onData, onError, onSuccess } = this.props;
+    const { account, contract, onData, onError, onSuccess, nextStep } = this.props;
     const { fee, number, hasRequested } = this.props.data;
 
     const request = contract.functions.find((fn) => fn.name === 'request');
@@ -131,6 +128,7 @@ export default class SendRequest extends Component {
       .then(() => {
         this.setState({ step: 'sms-sent' });
         onSuccess();
+        nextStep();
       })
       .catch((err) => {
         console.error('failed to request sms verification', err);

From bd839d019c5933b6dc7372b5ead4ee9bcabb3333 Mon Sep 17 00:00:00 2001
From: Jannis R <mail@jannisr.de>
Date: Thu, 10 Nov 2016 16:23:09 +0100
Subject: [PATCH 25/57] sms verification: polish UI, linting issues :shirt:

---
 js/src/modals/SMSVerification/GatherData/gatherData.js | 8 ++++----
 js/src/modals/SMSVerification/QueryCode/queryCode.js   | 2 --
 js/src/modals/SMSVerification/SMSVerification.js       | 8 ++++----
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/js/src/modals/SMSVerification/GatherData/gatherData.js b/js/src/modals/SMSVerification/GatherData/gatherData.js
index 528aaf1d1..035874b62 100644
--- a/js/src/modals/SMSVerification/GatherData/gatherData.js
+++ b/js/src/modals/SMSVerification/GatherData/gatherData.js
@@ -61,7 +61,7 @@ export default class GatherData extends Component {
 
   render () {
     const { numberIsValid } = this.state;
-    const { isVerified, hasRequested } = this.props.data;
+    const { isVerified } = this.props.data;
 
     // TODO: proper legal text
     return (
@@ -79,14 +79,14 @@ export default class GatherData extends Component {
           label={ 'phone number' }
           hint={ 'the SMS will be sent to this number' }
           error={ numberIsValid ? null : 'invalid number' }
-          disabled={ isVerified || hasRequested }
+          disabled={ isVerified }
           onChange={ this.numberOnChange }
           onSubmit={ this.numberOnSubmit }
         />
         <Checkbox
           className={ styles.spacing }
           label={ 'I agree that my number will be stored.' }
-          disabled={ isVerified || hasRequested }
+          disabled={ isVerified }
           onCheck={ this.consentOnChange }
         />
       </Form>
@@ -140,7 +140,7 @@ export default class GatherData extends Component {
     if (hasRequested) {
       return (
         <div className={ styles.container }>
-          <ErrorIcon />
+          <InfoIcon />
           <p className={ styles.message }>You already requested verification.</p>
         </div>
       );
diff --git a/js/src/modals/SMSVerification/QueryCode/queryCode.js b/js/src/modals/SMSVerification/QueryCode/queryCode.js
index 08d9089e3..f06a8ace6 100644
--- a/js/src/modals/SMSVerification/QueryCode/queryCode.js
+++ b/js/src/modals/SMSVerification/QueryCode/queryCode.js
@@ -18,8 +18,6 @@ import React, { Component, PropTypes } from 'react';
 
 import { Form, Input } from '../../../ui';
 
-// import styles from './gatherData.css';
-
 const isValidCode = /^[A-Z0-9_-]{7,14}$/i;
 
 export default class QueryCode extends Component {
diff --git a/js/src/modals/SMSVerification/SMSVerification.js b/js/src/modals/SMSVerification/SMSVerification.js
index 1e20ea705..ce2549ebc 100644
--- a/js/src/modals/SMSVerification/SMSVerification.js
+++ b/js/src/modals/SMSVerification/SMSVerification.js
@@ -18,10 +18,10 @@ import React, { Component, PropTypes } from 'react';
 import ActionDoneAll from 'material-ui/svg-icons/action/done-all';
 import ContentClear from 'material-ui/svg-icons/content/clear';
 
-import { BusyStep, CompletedStep, Button, IdentityIcon, Modal } from '../../ui';
-import { validateAddress, validateUint } from '../../util/validation';
+import { Button, IdentityIcon, Modal } from '../../ui';
 
 import ABI from '../../contracts/abi/sms-verification.json';
+// TODO: move this to a better place
 const contract = '0xcE381B876A85A72303f7cA7b3a012f58F4CEEEeB';
 
 import GatherData from './GatherData';
@@ -120,9 +120,9 @@ export default class SMSVerification extends Component {
     const { step } = this.state;
     if (step === 4) {
       return this.renderFifthStep();
-    } else if (step === 3) {
+    } else if (step === 3) {
       return this.renderFourthStep();
-    } else if (step === 2) {
+    } else if (step === 2) {
       return this.renderThirdStep();
     } else if (step === 1) {
       return this.renderSecondStep();

From 1e696c41f78fe345226f1381b17b9bc06659745d Mon Sep 17 00:00:00 2001
From: GitLab Build Bot <jaco+gitlab@ethcore.io>
Date: Sun, 13 Nov 2016 13:13:54 +0000
Subject: [PATCH 26/57] [ci skip] js-precompiled 20161113-131228

---
 Cargo.lock                 | 2 +-
 ethcore/res/ethereum/tests | 2 +-
 js/package.json            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c3fa096b3..17ac92fad 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1249,7 +1249,7 @@ dependencies = [
 [[package]]
 name = "parity-ui-precompiled"
 version = "1.4.0"
-source = "git+https://github.com/ethcore/js-precompiled.git#bc1728a4d24c098ee8792372c14dff98f954518c"
+source = "git+https://github.com/ethcore/js-precompiled.git#c61e1f174d4f4534a340cbbaba94fbd5463043bd"
 dependencies = [
  "parity-dapps-glue 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
diff --git a/ethcore/res/ethereum/tests b/ethcore/res/ethereum/tests
index 9028c4801..97066e40c 160000
--- a/ethcore/res/ethereum/tests
+++ b/ethcore/res/ethereum/tests
@@ -1 +1 @@
-Subproject commit 9028c4801fd39fbb71a9796979182549a24e81c8
+Subproject commit 97066e40ccd061f727deb5cd860e4d9135aa2551
diff --git a/js/package.json b/js/package.json
index 485163e0a..0c2839d0f 100644
--- a/js/package.json
+++ b/js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "parity.js",
-  "version": "0.2.35",
+  "version": "0.2.36",
   "main": "release/index.js",
   "jsnext:main": "src/index.js",
   "author": "Parity Team <admin@parity.io>",

From 594bd35a5e9253561de6edf2d70fd7909427a474 Mon Sep 17 00:00:00 2001
From: GitLab Build Bot <jaco+gitlab@ethcore.io>
Date: Sun, 13 Nov 2016 13:20:20 +0000
Subject: [PATCH 27/57] [ci skip] js-precompiled 20161113-131856

---
 Cargo.lock                 | 2 +-
 ethcore/res/ethereum/tests | 2 +-
 js/package.json            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 17ac92fad..95be811e2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1249,7 +1249,7 @@ dependencies = [
 [[package]]
 name = "parity-ui-precompiled"
 version = "1.4.0"
-source = "git+https://github.com/ethcore/js-precompiled.git#c61e1f174d4f4534a340cbbaba94fbd5463043bd"
+source = "git+https://github.com/ethcore/js-precompiled.git#bf33dd4aabd2adb2178576db5a4d23b8902d39b8"
 dependencies = [
  "parity-dapps-glue 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
diff --git a/ethcore/res/ethereum/tests b/ethcore/res/ethereum/tests
index 97066e40c..9028c4801 160000
--- a/ethcore/res/ethereum/tests
+++ b/ethcore/res/ethereum/tests
@@ -1 +1 @@
-Subproject commit 97066e40ccd061f727deb5cd860e4d9135aa2551
+Subproject commit 9028c4801fd39fbb71a9796979182549a24e81c8
diff --git a/js/package.json b/js/package.json
index 0c2839d0f..270e270b6 100644
--- a/js/package.json
+++ b/js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "parity.js",
-  "version": "0.2.36",
+  "version": "0.2.37",
   "main": "release/index.js",
   "jsnext:main": "src/index.js",
   "author": "Parity Team <admin@parity.io>",

From 8ce362b224b59a3bb2493733881f183ab60480be Mon Sep 17 00:00:00 2001
From: Jannis R <mail@jannisr.de>
Date: Mon, 14 Nov 2016 12:31:26 +0100
Subject: [PATCH 28/57] sms verification: add terms of service

---
 .../SMSVerification/GatherData/gatherData.css | 12 +++++++++
 .../SMSVerification/GatherData/gatherData.js  |  4 ++-
 .../SMSVerification/terms-of-service.js       | 27 +++++++++++++++++++
 3 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 js/src/modals/SMSVerification/terms-of-service.js

diff --git a/js/src/modals/SMSVerification/GatherData/gatherData.css b/js/src/modals/SMSVerification/GatherData/gatherData.css
index 0c501c223..8d3fd6c77 100644
--- a/js/src/modals/SMSVerification/GatherData/gatherData.css
+++ b/js/src/modals/SMSVerification/GatherData/gatherData.css
@@ -33,3 +33,15 @@
   margin-bottom: 0;
   margin-left: .5em;
 }
+
+.terms {
+  line-height: 1.3;
+  opacity: .7;
+}
+.terms ul {
+  padding-left: 1.5em;
+}
+.terms li {
+  margin-top: .2em;
+  margin-bottom: .2em;
+}
diff --git a/js/src/modals/SMSVerification/GatherData/gatherData.js b/js/src/modals/SMSVerification/GatherData/gatherData.js
index 035874b62..24c32aa3a 100644
--- a/js/src/modals/SMSVerification/GatherData/gatherData.js
+++ b/js/src/modals/SMSVerification/GatherData/gatherData.js
@@ -27,6 +27,7 @@ import { Form, Input } from '../../../ui';
 import checkIfVerified from '../check-if-verified';
 import checkIfRequested from '../check-if-requested';
 
+import terms from '../terms-of-service';
 import styles from './gatherData.css';
 
 export default class GatherData extends Component {
@@ -85,10 +86,11 @@ export default class GatherData extends Component {
         />
         <Checkbox
           className={ styles.spacing }
-          label={ 'I agree that my number will be stored.' }
+          label={ 'I agree to the terms and conditions below.' }
           disabled={ isVerified }
           onCheck={ this.consentOnChange }
         />
+        <div className={ styles.terms }>{ terms }</div>
       </Form>
     );
   }
diff --git a/js/src/modals/SMSVerification/terms-of-service.js b/js/src/modals/SMSVerification/terms-of-service.js
new file mode 100644
index 000000000..f61b3c97d
--- /dev/null
+++ b/js/src/modals/SMSVerification/terms-of-service.js
@@ -0,0 +1,27 @@
+// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+import React from 'react';
+
+export default (
+  <ul>
+    <li>This privacy notice relates to your use of the Parity SMS verification service. We take your privacy seriously and deal in an honest, direct and transparent way when it comes to your data.</li>
+    <li>We collect your phone number when you use this service. This is temporarily kept in memory, and then encrypted and stored in our EU servers. We only retain the cryptographic hash of the number to prevent duplicated accounts. You consent to this use.</li>
+    <li>You pay a fee for the cost of this service using the account you want to verify.</li>
+    <li>Your phone number is transmitted to a third party US SMS verification service Twilio for the sole purpose of the SMS verification. You consent to this use. Twilio’s privacy policy is here: <a href={ 'https://www.twilio.com/legal/privacy/developer' }>https://www.twilio.com/legal/privacy/developer</a>.</li>
+    <li><i>Parity Technology Limited</i> is registered in England and Wales under company number <code>09760015</code> and complies with the Data Protection Act 1998 (UK). You may contact us via email at <a href={ 'mailto:admin@parity.io' }>admin@parity.io</a>. Our general privacy policy can be found here: <a href={ 'https://ethcore.io/legal.html' }>https://ethcore.io/legal.html</a>.</li>
+  </ul>
+);

From b1fcee73a58651c40c1b7657365dae7cb11c1427 Mon Sep 17 00:00:00 2001
From: Jannis R <mail@jannisr.de>
Date: Mon, 14 Nov 2016 12:33:29 +0100
Subject: [PATCH 29/57] sms verification: less block confirmations

---
 .../SMSVerification/SendConfirmation/sendConfirmation.js      | 4 ++--
 js/src/modals/SMSVerification/SendRequest/sendRequest.js      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/js/src/modals/SMSVerification/SendConfirmation/sendConfirmation.js b/js/src/modals/SMSVerification/SendConfirmation/sendConfirmation.js
index 4f044d51c..48051a4c6 100644
--- a/js/src/modals/SMSVerification/SendConfirmation/sendConfirmation.js
+++ b/js/src/modals/SMSVerification/SendConfirmation/sendConfirmation.js
@@ -64,7 +64,7 @@ export default class SendConfirmation extends Component {
     if (step === 'posted') {
       return (
         <div className={ styles.centered }>
-          <TxHash hash={ this.props.data.txHash } maxConfirmations={ 3 } />
+          <TxHash hash={ this.props.data.txHash } maxConfirmations={ 2 } />
           <p>Please keep this window open.</p>
         </div>);
     }
@@ -98,7 +98,7 @@ export default class SendConfirmation extends Component {
       .then((txHash) => {
         onData({ txHash: txHash });
         this.setState({ step: 'posted' });
-        return waitForConfirmations(api, txHash, 3);
+        return waitForConfirmations(api, txHash, 2);
       })
       .then(() => {
         onSuccess();
diff --git a/js/src/modals/SMSVerification/SendRequest/sendRequest.js b/js/src/modals/SMSVerification/SendRequest/sendRequest.js
index 056728116..f66ef4de5 100644
--- a/js/src/modals/SMSVerification/SendRequest/sendRequest.js
+++ b/js/src/modals/SMSVerification/SendRequest/sendRequest.js
@@ -79,7 +79,7 @@ export default class SendRequest extends Component {
     if (step === 'posted') {
       return (
         <div className={ styles.centered }>
-          <TxHash hash={ this.props.data.txHash } maxConfirmations={ 3 } />
+          <TxHash hash={ this.props.data.txHash } maxConfirmations={ 1 } />
           <p>Please keep this window open.</p>
         </div>);
     }
@@ -116,7 +116,7 @@ export default class SendRequest extends Component {
         .then((txHash) => {
           onData({ txHash: txHash });
           this.setState({ step: 'posted' });
-          return waitForConfirmations(api, txHash, 3);
+          return waitForConfirmations(api, txHash, 1);
         });
     }
 

From b5560d27a0520cecc4ba8e973efb504ef9e8c71d Mon Sep 17 00:00:00 2001
From: Jannis R <mail@jannisr.de>
Date: Mon, 14 Nov 2016 18:03:07 +0100
Subject: [PATCH 30/57] sms verification: pull out postToVerificationServer

---
 .../SendRequest/sendRequest.js                | 16 +-------
 .../post-to-verification-server.js            | 38 +++++++++++++++++++
 2 files changed, 39 insertions(+), 15 deletions(-)
 create mode 100644 js/src/modals/SMSVerification/post-to-verification-server.js

diff --git a/js/src/modals/SMSVerification/SendRequest/sendRequest.js b/js/src/modals/SMSVerification/SendRequest/sendRequest.js
index f66ef4de5..dd1212e0d 100644
--- a/js/src/modals/SMSVerification/SendRequest/sendRequest.js
+++ b/js/src/modals/SMSVerification/SendRequest/sendRequest.js
@@ -19,24 +19,10 @@ import qs from 'querystring';
 
 import TxHash from '../../../ui/TxHash';
 import waitForConfirmations from '../wait-for-confirmations';
+import postToVerificationServer from '../post-to-verification-server';
 
 import styles from './sendRequest.css';
 
-const postToVerificationServer = (query) => {
-  query = qs.stringify(query);
-  return fetch('https://sms-verification.parity.io/?' + query, {
-    method: 'POST', mode: 'cors', cache: 'no-store'
-  })
-  .then((res) => {
-    return res.json().then((data) => {
-      if (res.ok) {
-        return data.message;
-      }
-      throw new Error(data.message || 'unknown error');
-    });
-  });
-};
-
 export default class SendRequest extends Component {
   static contextTypes = {
     api: PropTypes.object.isRequired
diff --git a/js/src/modals/SMSVerification/post-to-verification-server.js b/js/src/modals/SMSVerification/post-to-verification-server.js
new file mode 100644
index 000000000..c989e84e9
--- /dev/null
+++ b/js/src/modals/SMSVerification/post-to-verification-server.js
@@ -0,0 +1,38 @@
+// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+import { stringify } from 'querystring';
+
+const postToVerificationServer = (query) => {
+  query = stringify(query);
+  return fetch('https://sms-verification.parity.io/?' + query, {
+    method: 'POST', mode: 'cors', cache: 'no-store'
+  })
+  .then((res) => {
+    return res.json().then((data) => {
+      if (res.ok) {
+        return data.message;
+      }
+      throw new Error(data.message || 'unknown error');
+    });
+  })
+  .catch((err) => {
+    console.error('foooo', err.stack);
+    throw err
+  });
+};
+
+export default postToVerificationServer;

From 8ef9fff8ba67af77f6a57dc020d2103553edb546 Mon Sep 17 00:00:00 2001
From: Jannis R <mail@jannisr.de>
Date: Tue, 15 Nov 2016 12:43:50 +0100
Subject: [PATCH 31/57] sms verification: put process into MobX store

---
 js/src/modals/SMSVerification/store.js | 191 +++++++++++++++++++++++++
 1 file changed, 191 insertions(+)
 create mode 100644 js/src/modals/SMSVerification/store.js

diff --git a/js/src/modals/SMSVerification/store.js b/js/src/modals/SMSVerification/store.js
new file mode 100644
index 000000000..669a168e6
--- /dev/null
+++ b/js/src/modals/SMSVerification/store.js
@@ -0,0 +1,191 @@
+// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+import { observable, computed, autorun, action } from 'mobx';
+import phone from 'phoneformat.js';
+import { sha3 } from '../../api/util/sha3';
+
+import ABI from '../../contracts/abi/sms-verification.json';
+// TODO: move this to a better place
+const contract = '0xcE381B876A85A72303f7cA7b3a012f58F4CEEEeB';
+
+import checkIfVerified from './check-if-verified';
+import checkIfRequested from './check-if-requested';
+import waitForConfirmations from './wait-for-confirmations';
+import postToVerificationServer from './post-to-verification-server';
+
+const validCode = /^[A-Z0-9_-]{7,14}$/i;
+
+export default class VerificationStore {
+  static GATHERING_DATA = 'gathering-data';
+  static GATHERED_DATA = 'gathered-data';
+  static POSTING_REQUEST = 'posting-request';
+  static POSTED_REQUEST = 'posted-request';
+  static REQUESTING_SMS = 'requesting-sms';
+  static REQUESTED_SMS = 'requested-sms';
+  static QUERY_CODE = 'query-code';
+  static POSTING_CONFIRMATION = 'posting-confirmation';
+  static POSTED_CONFIRMATION = 'posted-confirmation';
+  static DONE = 'done';
+
+  @observable step = null;
+  @observable error = null;
+
+  @observable fee = null;
+  @observable isVerified = null;
+  @observable hasRequested = null;
+  @observable consentGiven = false;
+  @observable number = '';
+  @observable requestTx = null;
+  @observable code = '';
+  @observable confirmationTx = null;
+
+  @computed get isCodeValid () {
+    return validCode.test(this.code);
+  }
+  @computed get isNumberValid () {
+    return phone.isValidNumber(this.number);
+  }
+
+  constructor (api, account) {
+    this.api = api;
+    this.account = account;
+    this.contract = api.newContract(ABI, contract);
+
+    autorun(() => {
+      if (this.error) {
+        console.error('sms verification: ' + this.error);
+      }
+    });
+  }
+
+  @action gatherData = () => {
+    const { contract, account } = this;
+    this.step = VerificationStore.GATHERING_DATA;
+
+    const fee = contract.instance.fee.call()
+      .then((fee) => {
+        this.fee = fee;
+      })
+      .catch((err) => {
+        this.error = 'Failed to fetch the fee: ' + err.message;
+      });
+
+    const isVerified = checkIfVerified(contract, account)
+      .then((isVerified) => {
+        this.isVerified = isVerified;
+      })
+      .catch((err) => {
+        this.error = 'Failed to check if verified: ' + err.message;
+      });
+
+    const hasRequested = checkIfRequested(contract, account)
+      .then((hasRequested) => {
+        this.hasRequested = hasRequested;
+      })
+      .catch((err) => {
+        this.error = 'Failed to check if requested: ' + err.message;
+      });
+
+    Promise.all([ fee, isVerified, hasRequested ])
+    .then(() => {
+      this.step = VerificationStore.GATHERED_DATA;
+    });
+  }
+
+  @action setNumber = (number) => {
+    this.number = number;
+  }
+
+  @action setConsentGiven = (consentGiven) => {
+    this.consentGiven = consentGiven;
+  }
+
+  @action sendRequest = () => {
+    const { api, account, contract, fee, number, hasRequested } = this;
+
+    const request = contract.functions.find((fn) => fn.name === 'request');
+    const options = { from: account, value: fee.toString() };
+
+    let chain = Promise.resolve();
+    if (!hasRequested) {
+      this.step = VerificationStore.POSTING_REQUEST;
+      chain = request.estimateGas(options, [])
+        .then((gas) => {
+          options.gas = gas.mul(1.2).toFixed(0);
+          return request.postTransaction(options, []);
+        })
+        .then((handle) => {
+          // TODO: The "request rejected" error doesn't have any property to
+          // distinguish it from other errors, so we can't give a meaningful error here.
+          return api.pollMethod('parity_checkRequest', handle);
+        })
+        .then((txHash) => {
+          this.requestTx = txHash;
+          this.step = VerificationStore.POSTED_REQUEST;
+          return waitForConfirmations(api, txHash, 1);
+        });
+    }
+
+    chain
+      .then(() => {
+        this.step = VerificationStore.REQUESTING_SMS;
+        return postToVerificationServer({ number, address: account });
+      })
+      .then(() => {
+        this.step = VerificationStore.REQUESTED_SMS;
+      })
+      .catch((err) => {
+        this.error = 'Failed to request a confirmation SMS: ' + err.message;
+      });
+  }
+
+  @action setCode = (code) => {
+    this.code = code;
+  }
+
+  @action sendConfirmation = () => {
+    const { api, account, contract, code } = this;
+    const token = sha3(code);
+
+    const confirm = contract.functions.find((fn) => fn.name === 'confirm');
+    const options = { from: account };
+    const values = [ token ];
+
+    this.step = VerificationStore.POSTING_CONFIRMATION;
+    confirm.estimateGas(options, values)
+      .then((gas) => {
+        options.gas = gas.mul(1.2).toFixed(0);
+        return confirm.postTransaction(options, values);
+      })
+      .then((handle) => {
+        // TODO: The "request rejected" error doesn't have any property to
+        // distinguish it from other errors, so we can't give a meaningful error here.
+        return api.pollMethod('parity_checkRequest', handle);
+      })
+      .then((txHash) => {
+        this.confirmationTx = txHash;
+        this.step = VerificationStore.POSTED_CONFIRMATION;
+        return waitForConfirmations(api, txHash, 2);
+      })
+      .then(() => {
+        this.step = VerificationStore.DONE;
+      })
+      .catch((err) => {
+        this.error = 'Failed to send the verification code: ' + err.message;
+      });
+  }
+}

From 71986249e5b4e7a9bdf063d4d29571b9caa277f2 Mon Sep 17 00:00:00 2001
From: Jannis R <mail@jannisr.de>
Date: Tue, 15 Nov 2016 13:26:14 +0100
Subject: [PATCH 32/57] sms verification: make GatherData component dumb

---
 .../SMSVerification/GatherData/gatherData.js  | 114 +++---------------
 1 file changed, 17 insertions(+), 97 deletions(-)

diff --git a/js/src/modals/SMSVerification/GatherData/gatherData.js b/js/src/modals/SMSVerification/GatherData/gatherData.js
index 24c32aa3a..c89263bd9 100644
--- a/js/src/modals/SMSVerification/GatherData/gatherData.js
+++ b/js/src/modals/SMSVerification/GatherData/gatherData.js
@@ -15,56 +15,33 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 import React, { Component, PropTypes } from 'react';
+import BigNumber from 'bignumber.js';
 import { Checkbox } from 'material-ui';
 import InfoIcon from 'material-ui/svg-icons/action/info-outline';
 import SuccessIcon from 'material-ui/svg-icons/navigation/check';
 import ErrorIcon from 'material-ui/svg-icons/navigation/close';
 
-import phone from 'phoneformat.js';
-
 import { fromWei } from '../../../api/util/wei';
 import { Form, Input } from '../../../ui';
-import checkIfVerified from '../check-if-verified';
-import checkIfRequested from '../check-if-requested';
 
 import terms from '../terms-of-service';
 import styles from './gatherData.css';
 
+const nullable = (type) => PropTypes.oneOfType([ PropTypes.oneOf([ null ]), type ]);
+
 export default class GatherData extends Component {
-  static contextTypes = {
-    api: PropTypes.object.isRequired
-  }
-
   static propTypes = {
-    account: PropTypes.string.isRequired,
-    contract: PropTypes.object.isRequired,
-    data: PropTypes.object.isRequired,
-    onData: PropTypes.func.isRequired,
-    onDataIsValid: PropTypes.func.isRequired,
-    onDataIsInvalid: PropTypes.func.isRequired
-  }
-
-  state = {
-    init: true,
-    numberIsValid: null,
-    consentGiven: false
-  };
-
-  componentWillMount () {
-    const { init } = this.state;
-    if (init) {
-      this.setState({ init: false });
-      this.queryFee();
-      this.checkIfCertified();
-      this.checkIfRequested();
-    }
+    fee: React.PropTypes.instanceOf(BigNumber),
+    isNumberValid: PropTypes.bool.isRequired,
+    isVerified: nullable(PropTypes.bool.isRequired),
+    hasRequested: nullable(PropTypes.bool.isRequired),
+    setNumber: PropTypes.func.isRequired,
+    setConsentGiven: PropTypes.func.isRequired
   }
 
   render () {
-    const { numberIsValid } = this.state;
-    const { isVerified } = this.props.data;
+    const { isNumberValid, isVerified } = this.props;
 
-    // TODO: proper legal text
     return (
       <Form>
         <p>The following steps will let you prove that you control both an account and a phone number.</p>
@@ -79,7 +56,7 @@ export default class GatherData extends Component {
         <Input
           label={ 'phone number' }
           hint={ 'the SMS will be sent to this number' }
-          error={ numberIsValid ? null : 'invalid number' }
+          error={ isNumberValid ? null : 'invalid number' }
           disabled={ isVerified }
           onChange={ this.numberOnChange }
           onSubmit={ this.numberOnSubmit }
@@ -96,7 +73,7 @@ export default class GatherData extends Component {
   }
 
   renderFee () {
-    const { fee } = this.props.data;
+    const { fee } = this.props;
 
     if (!fee) {
       return (<p>Fetching the fee…</p>);
@@ -110,7 +87,7 @@ export default class GatherData extends Component {
   }
 
   renderCertified () {
-    const { isVerified } = this.props.data;
+    const { isVerified } = this.props;
 
     if (isVerified) {
       return (
@@ -132,7 +109,7 @@ export default class GatherData extends Component {
   }
 
   renderRequested () {
-    const { isVerified, hasRequested } = this.props.data;
+    const { isVerified, hasRequested } = this.props;
 
     // If the account is verified, don't show that it has requested verification.
     if (isVerified) {
@@ -158,72 +135,15 @@ export default class GatherData extends Component {
     return (<p className={ styles.message }>Checking if you requested verification…</p>);
   }
 
-  queryFee = () => {
-    const { contract, onData } = this.props;
-
-    contract.instance.fee.call()
-    .then((fee) => {
-      onData({ fee });
-      this.onChange();
-    })
-    .catch((err) => {
-      console.error('error fetching fee', err);
-      this.onChange();
-    });
-  }
-
-  checkIfCertified = () => {
-    const { account, contract, onData } = this.props;
-
-    checkIfVerified(contract, account)
-    .then((isVerified) => {
-      onData({ isVerified });
-      this.onChange();
-    })
-    .catch((err) => {
-      console.error('error checking if certified', err);
-    });
-  }
-
-  checkIfRequested = () => {
-    const { account, contract, onData } = this.props;
-
-    checkIfRequested(contract, account)
-    .then((hasRequested) => {
-      onData({ hasRequested });
-      this.onChange();
-    })
-    .catch((err) => {
-      console.error('error checking if requested', err);
-    });
-  }
-
   numberOnSubmit = (value) => {
-    this.numberOnChange(null, value);
-    this.props.onData({ number: value });
+    this.props.setNumber(value);
   }
 
   numberOnChange = (_, value) => {
-    this.setState({
-      numberIsValid: phone.isValidNumber(value)
-    }, this.onChange);
+    this.props.setNumber(value);
   }
 
   consentOnChange = (_, consentGiven) => {
-    this.setState({
-      consentGiven: !!consentGiven
-    }, this.onChange);
-    this.props.onData({ consent: consentGiven });
-  }
-
-  onChange = () => {
-    const { fee, isVerified } = this.props.data;
-    const { numberIsValid, consentGiven } = this.state;
-
-    if (fee && numberIsValid && consentGiven && isVerified === false) {
-      this.props.onDataIsValid();
-    } else {
-      this.props.onDataIsInvalid();
-    }
+    this.props.setConsentGiven(consentGiven);
   }
 }

From f48a341c32aafb688252e4bfbf246598bff23b20 Mon Sep 17 00:00:00 2001
From: Jannis R <mail@jannisr.de>
Date: Tue, 15 Nov 2016 13:33:58 +0100
Subject: [PATCH 33/57] sms verification: make SendRequest component dumb

---
 .../SendRequest/sendRequest.js                | 103 +++---------------
 1 file changed, 16 insertions(+), 87 deletions(-)

diff --git a/js/src/modals/SMSVerification/SendRequest/sendRequest.js b/js/src/modals/SMSVerification/SendRequest/sendRequest.js
index dd1212e0d..482eac679 100644
--- a/js/src/modals/SMSVerification/SendRequest/sendRequest.js
+++ b/js/src/modals/SMSVerification/SendRequest/sendRequest.js
@@ -15,115 +15,44 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 import React, { Component, PropTypes } from 'react';
-import qs from 'querystring';
 
 import TxHash from '../../../ui/TxHash';
-import waitForConfirmations from '../wait-for-confirmations';
-import postToVerificationServer from '../post-to-verification-server';
+import VerificationStore from '../store';
+const {
+  POSTING_REQUEST, POSTED_REQUEST, REQUESTING_SMS
+} = VerificationStore;
 
 import styles from './sendRequest.css';
 
+// TODO: move this to a better place
+const nullable = (type) => PropTypes.oneOfType([ PropTypes.oneOf([ null ]), type ]);
+
 export default class SendRequest extends Component {
-  static contextTypes = {
-    api: PropTypes.object.isRequired
-  }
-
   static propTypes = {
-    account: PropTypes.string.isRequired,
-    contract: PropTypes.object.isRequired,
-    data: PropTypes.object.isRequired,
-    onData: PropTypes.func.isRequired,
-    onSuccess: PropTypes.func.isRequired,
-    onError: PropTypes.func.isRequired,
-    nextStep: PropTypes.func.isRequired
-  }
-
-  state = {
-    init: true,
-    step: 'init'
-  };
-
-  componentWillMount () {
-    const { init } = this.state;
-    if (init) {
-      this.send();
-      this.setState({ init: false });
-    }
+    step: PropTypes.any.isRequired,
+    tx: nullable(PropTypes.any.isRequired)
   }
 
   render () {
-    const { step } = this.state;
+    const { step, tx } = this.props;
 
-    if (step === 'error') {
-      return (<p>{ this.state.error }</p>);
-    }
-
-    if (step === 'pending') {
+    if (step === POSTING_REQUEST) {
       return (<p>A verification request will be sent to the contract. Please authorize this using the Parity Signer.</p>);
     }
 
-    if (step === 'posted') {
+    if (step === POSTED_REQUEST) {
       return (
         <div className={ styles.centered }>
-          <TxHash hash={ this.props.data.txHash } maxConfirmations={ 1 } />
+          <TxHash hash={ tx } maxConfirmations={ 1 } />
           <p>Please keep this window open.</p>
-        </div>);
+        </div>
+      );
     }
 
-    if (step === 'mined') {
+    if (step === REQUESTING_SMS) {
       return (<p>Requesting an SMS from the Parity server.</p>);
     }
 
     return null;
   }
-
-  send = () => {
-    const { api } = this.context;
-    const { account, contract, onData, onError, onSuccess, nextStep } = this.props;
-    const { fee, number, hasRequested } = this.props.data;
-
-    const request = contract.functions.find((fn) => fn.name === 'request');
-    const options = { from: account, value: fee.toString() };
-
-    let chain = Promise.resolve();
-    if (!hasRequested) {
-      chain = request.estimateGas(options, [])
-        .then((gas) => {
-          options.gas = gas.mul(1.2).toFixed(0);
-          // TODO: show message
-          this.setState({ step: 'pending' });
-          return request.postTransaction(options, []);
-        })
-        .then((handle) => {
-          // TODO: The "request rejected" error doesn't have any property to
-          // distinguish it from other errors, so we can't give a meaningful error here.
-          return api.pollMethod('parity_checkRequest', handle);
-        })
-        .then((txHash) => {
-          onData({ txHash: txHash });
-          this.setState({ step: 'posted' });
-          return waitForConfirmations(api, txHash, 1);
-        });
-    }
-
-    chain
-      .then(() => {
-        this.setState({ step: 'mined' });
-        return postToVerificationServer({ number, address: account });
-      })
-      .then(() => {
-        this.setState({ step: 'sms-sent' });
-        onSuccess();
-        nextStep();
-      })
-      .catch((err) => {
-        console.error('failed to request sms verification', err);
-        onError(err);
-        this.setState({
-          step: 'error',
-          error: 'Failed to request a confirmation SMS: ' + err.message
-        });
-        // TODO: show message in SnackBar
-      });
-  }
 }

From 377c16cf7893fd0ebc5a723caa647f38d65dda69 Mon Sep 17 00:00:00 2001
From: Jannis R <mail@jannisr.de>
Date: Tue, 15 Nov 2016 13:39:10 +0100
Subject: [PATCH 34/57] sms verification: make QueryCode component dumb

---
 .../SMSVerification/QueryCode/queryCode.js    | 24 ++++++-------------
 1 file changed, 7 insertions(+), 17 deletions(-)

diff --git a/js/src/modals/SMSVerification/QueryCode/queryCode.js b/js/src/modals/SMSVerification/QueryCode/queryCode.js
index f06a8ace6..b4da6c8f4 100644
--- a/js/src/modals/SMSVerification/QueryCode/queryCode.js
+++ b/js/src/modals/SMSVerification/QueryCode/queryCode.js
@@ -18,18 +18,15 @@ import React, { Component, PropTypes } from 'react';
 
 import { Form, Input } from '../../../ui';
 
-const isValidCode = /^[A-Z0-9_-]{7,14}$/i;
-
 export default class QueryCode extends Component {
   static propTypes = {
-    data: PropTypes.object.isRequired,
-    onData: PropTypes.func.isRequired,
-    onDataIsValid: PropTypes.func.isRequired,
-    onDataIsInvalid: PropTypes.func.isRequired
+    number: PropTypes.string.isRequired,
+    isCodeValid: PropTypes.bool.isRequired,
+    setCode: PropTypes.func.isRequired
   }
 
   render () {
-    const { number, code } = this.props.data;
+    const { number, isCodeValid } = this.props;
 
     return (
       <Form>
@@ -37,7 +34,7 @@ export default class QueryCode extends Component {
         <Input
           label={ 'verification code' }
           hint={ 'Enter the code you received via SMS.' }
-          error={ isValidCode.test(code) ? null : 'invalid code' }
+          error={ isCodeValid ? null : 'invalid code' }
           onChange={ this.onChange }
           onSubmit={ this.onSubmit }
         />
@@ -46,16 +43,9 @@ export default class QueryCode extends Component {
   }
 
   onChange = (_, code) => {
-    code = code.trim();
-    this.props.onData({ code });
-
-    if (isValidCode.test(code)) {
-      this.props.onDataIsValid();
-    } else {
-      this.props.onDataIsInvalid();
-    }
+    this.props.setCode(code.trim());
   }
   onSubmit = (code) => {
-    this.onChange(null, code);
+    this.props.setCode(code.trim());
   }
 }

From 90df237ca5363aabcc86c0264ef4ec770290fc78 Mon Sep 17 00:00:00 2001
From: Jannis R <mail@jannisr.de>
Date: Tue, 15 Nov 2016 13:42:34 +0100
Subject: [PATCH 35/57] sms verification: make SendConfirmation component dumb

---
 .../SendConfirmation/sendConfirmation.js      | 95 ++++---------------
 1 file changed, 16 insertions(+), 79 deletions(-)

diff --git a/js/src/modals/SMSVerification/SendConfirmation/sendConfirmation.js b/js/src/modals/SMSVerification/SendConfirmation/sendConfirmation.js
index 48051a4c6..9e531f6a9 100644
--- a/js/src/modals/SMSVerification/SendConfirmation/sendConfirmation.js
+++ b/js/src/modals/SMSVerification/SendConfirmation/sendConfirmation.js
@@ -15,103 +15,40 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 import React, { Component, PropTypes } from 'react';
-import TxHash from '../../../ui/TxHash';
 
-import { sha3 } from '../../../api/util/sha3';
-import waitForConfirmations from '../wait-for-confirmations';
+import TxHash from '../../../ui/TxHash';
+import VerificationStore from '../store';
+const {
+  POSTING_CONFIRMATION, POSTED_CONFIRMATION
+} = VerificationStore;
 
 import styles from './sendConfirmation.css';
 
+// TODO: move this to a better place
+const nullable = (type) => PropTypes.oneOfType([ PropTypes.oneOf([ null ]), type ]);
+
 export default class SendConfirmation extends Component {
-  static contextTypes = {
-    api: PropTypes.object.isRequired
-  }
-
   static propTypes = {
-    account: PropTypes.string.isRequired,
-    contract: PropTypes.object.isRequired,
-    data: PropTypes.object.isRequired,
-    onData: PropTypes.func.isRequired,
-    onSuccess: PropTypes.func.isRequired,
-    onError: PropTypes.func.isRequired,
-    nextStep: PropTypes.func.isRequired
-  }
-
-  state = {
-    init: true,
-    step: 'init'
-  };
-
-  componentWillMount () {
-    const { init } = this.state;
-    if (init) {
-      this.send();
-      this.setState({ init: false });
-    }
+    step: PropTypes.any.isRequired,
+    tx: nullable(PropTypes.any.isRequired)
   }
 
   render () {
-    const { step } = this.state;
+    const { step, tx } = this.props;
 
-    if (step === 'error') {
-      return (<p>{ this.state.error }</p>);
-    }
-
-    if (step === 'pending') {
+    if (step === POSTING_CONFIRMATION) {
       return (<p>The verification code will be sent to the contract. Please authorize this using the Parity Signer.</p>);
     }
 
-    if (step === 'posted') {
+    if (step === POSTED_CONFIRMATION) {
       return (
         <div className={ styles.centered }>
-          <TxHash hash={ this.props.data.txHash } maxConfirmations={ 2 } />
+          <TxHash hash={ tx } maxConfirmations={ 2 } />
           <p>Please keep this window open.</p>
-        </div>);
+        </div>
+      );
     }
 
     return null;
   }
-
-  send = () => {
-    const { api } = this.context;
-    const { account, contract, onData, onError, onSuccess, nextStep } = this.props;
-
-    const { code } = this.props.data;
-    const token = sha3(code);
-
-    const confirm = contract.functions.find((fn) => fn.name === 'confirm');
-    const options = { from: account };
-    const values = [ token ];
-
-    confirm.estimateGas(options, values)
-      .then((gas) => {
-        options.gas = gas.mul(1.2).toFixed(0);
-        // TODO: show message
-        this.setState({ step: 'pending' });
-        return confirm.postTransaction(options, values);
-      })
-      .then((handle) => {
-        // TODO: The "request rejected" error doesn't have any property to
-        // distinguish it from other errors, so we can't give a meaningful error here.
-        return api.pollMethod('parity_checkRequest', handle);
-      })
-      .then((txHash) => {
-        onData({ txHash: txHash });
-        this.setState({ step: 'posted' });
-        return waitForConfirmations(api, txHash, 2);
-      })
-      .then(() => {
-        onSuccess();
-        nextStep();
-      })
-      .catch((err) => {
-        console.error('failed to confirm sms verification', err);
-        onError(err);
-        this.setState({
-          step: 'error',
-          error: 'Failed to send the verification code: ' + err.message
-        });
-        // TODO: show message in SnackBar
-      });
-  }
 }

From bfcc8d33d6fb5493ac8bed8805656eafe9a9cca8 Mon Sep 17 00:00:00 2001
From: Jannis R <mail@jannisr.de>
Date: Tue, 15 Nov 2016 13:45:27 +0100
Subject: [PATCH 36/57] sms verification: make Done component dumb

---
 js/src/modals/SMSVerification/Done/done.js | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/js/src/modals/SMSVerification/Done/done.js b/js/src/modals/SMSVerification/Done/done.js
index 0af05ad41..f3f6fa515 100644
--- a/js/src/modals/SMSVerification/Done/done.js
+++ b/js/src/modals/SMSVerification/Done/done.js
@@ -14,20 +14,12 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
 import SuccessIcon from 'material-ui/svg-icons/navigation/check';
 
 import styles from './done.css';
 
 export default class Done extends Component {
-  static propTypes = {
-    onSuccess: PropTypes.func.isRequired
-  }
-
-  componentWillMount () {
-    this.props.onSuccess();
-  }
-
   render () {
     return (
       <div className={ styles.container }>

From 3e879aac35466a089653762fd1c95e81f33847fe Mon Sep 17 00:00:00 2001
From: Jannis R <mail@jannisr.de>
Date: Tue, 15 Nov 2016 16:21:53 +0100
Subject: [PATCH 37/57] sms verification: use Mobx store

---
 .../modals/SMSVerification/SMSVerification.js | 184 +++++++-----------
 js/src/modals/SMSVerification/store.js        |  49 ++++-
 2 files changed, 113 insertions(+), 120 deletions(-)

diff --git a/js/src/modals/SMSVerification/SMSVerification.js b/js/src/modals/SMSVerification/SMSVerification.js
index ce2549ebc..7c31e00de 100644
--- a/js/src/modals/SMSVerification/SMSVerification.js
+++ b/js/src/modals/SMSVerification/SMSVerification.js
@@ -15,14 +15,20 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 import React, { Component, PropTypes } from 'react';
+import { observer } from 'mobx-react';
 import ActionDoneAll from 'material-ui/svg-icons/action/done-all';
 import ContentClear from 'material-ui/svg-icons/content/clear';
 
 import { Button, IdentityIcon, Modal } from '../../ui';
 
-import ABI from '../../contracts/abi/sms-verification.json';
-// TODO: move this to a better place
-const contract = '0xcE381B876A85A72303f7cA7b3a012f58F4CEEEeB';
+import VerificationStore from './store';
+const {
+  GATHERING_DATA, GATHERED_DATA,
+  POSTING_REQUEST, POSTED_REQUEST,
+  REQUESTING_SMS, REQUESTED_SMS,
+  POSTING_CONFIRMATION, POSTED_CONFIRMATION,
+  DONE
+} = VerificationStore;
 
 import GatherData from './GatherData';
 import SendRequest from './SendRequest';
@@ -30,6 +36,7 @@ import QueryCode from './QueryCode';
 import SendConfirmation from './SendConfirmation';
 import Done from './Done';
 
+@observer
 export default class SMSVerification extends Component {
   static contextTypes = {
     api: PropTypes.object.isRequired
@@ -40,41 +47,51 @@ export default class SMSVerification extends Component {
     onClose: PropTypes.func.isRequired
   }
 
+  static uiSteps = { // mapping (store steps -> steps)
+    [GATHERING_DATA]: 0, [GATHERED_DATA]: 0,
+    [POSTING_REQUEST]: 1, [POSTED_REQUEST]: 1, [REQUESTING_SMS]: 1,
+    [REQUESTED_SMS]: 2,
+    [POSTING_CONFIRMATION]: 3, [POSTED_CONFIRMATION]: 3,
+    [DONE]: 4
+  }
+
   state = {
-    contract: null,
-    step: 0,
-    stepIsValid: false,
-    data: {}
+    store: null
   }
 
   componentDidMount () {
     const { api } = this.context;
+    const { account } = this.props;
 
-    this.setState({
-      contract: api.newContract(ABI, contract)
+    const store = new VerificationStore(api, account);
+    this.setState({ store }, () => {
+      store.gatherData();
     });
   }
 
   render () {
-    const { step } = this.state;
+    const { store } = this.state;
+    if (!store) return null;
+    const step = SMSVerification.uiSteps[store.step];
+    const { error, isStepValid } = store;
 
     return (
       <Modal
-        actions={ this.renderDialogActions() }
+        actions={ this.renderDialogActions(step, error, isStepValid) }
         title='verify your account via SMS'
         visible scroll
         current={ step }
         steps={ ['Enter Data', 'Request', 'Enter Code', 'Confirm', 'Done!'] }
         waiting={ [ 1, 3 ] }
       >
-        { this.renderStep() }
+        { this.renderStep(step, error) }
       </Modal>
     );
   }
 
-  renderDialogActions () {
+  renderDialogActions (step, error, isStepValid) {
     const { onClose, account } = this.props;
-    const { step, stepIsValid } = this.state;
+    const { store } = this.state;
 
     const cancel = (
       <Button
@@ -83,6 +100,7 @@ export default class SMSVerification extends Component {
         onClick={ onClose }
       />
     );
+    if (error) return (<div>{ cancel }</div>);
 
     if (step === 4) {
       return (
@@ -90,7 +108,7 @@ export default class SMSVerification extends Component {
           { cancel }
           <Button
             key='done' label='Done'
-            disabled={ !stepIsValid }
+            disabled={ !isStepValid }
             icon={ <ActionDoneAll /> }
             onClick={ onClose }
           />
@@ -98,116 +116,62 @@ export default class SMSVerification extends Component {
       );
     }
 
+    let action;
+    if (step === 3) {
+      action = store.done;
+    } else if (step === 2) {
+      action = store.sendConfirmation;
+    } else if (step === 1) {
+      action = store.queryCode;
+    } else if (step === 0) {
+      action = store.sendRequest;
+    }
+
     return (
       <div>
         { cancel }
         <Button
           key='next' label='Next'
-          disabled={ !stepIsValid }
+          disabled={ !isStepValid }
           icon={ <IdentityIcon address={ account } button /> }
-          onClick={ this.next }
+          onClick={ action }
         />
       </div>
     );
   }
 
-  renderStep () {
-    const { contract } = this.state;
-    if (!contract) {
-      return null;
-    }
+  renderStep (step, error) {
+    if (error) return (<p>{ error }</p>);
+
+    const {
+      fee, isNumberValid, isVerified, hasRequested,
+      requestTx, isCodeValid, confirmationTx,
+      setNumber, setConsentGiven, setCode
+    } = this.state.store;
 
-    const { step } = this.state;
     if (step === 4) {
-      return this.renderFifthStep();
-    } else if (step === 3) {
-      return this.renderFourthStep();
-    } else if (step === 2) {
-      return this.renderThirdStep();
-    } else if (step === 1) {
-      return this.renderSecondStep();
-    } else {
-      return this.renderFirstStep();
+      return (<Done />);
     }
-  }
-
-  onDataIsValid = () => {
-    this.setState({ stepIsValid: true });
-  }
-  onDataIsInvalid = () => {
-    this.setState({ stepIsValid: false });
-  }
-  onData = (data) => {
-    this.setState({
-      data: Object.assign({}, this.state.data, data)
-    });
-  }
-
-  next = () => {
-    const { stepIsValid } = this.state;
-    if (stepIsValid) {
-      this.setState({ step: this.state.step + 1, stepIsValid: false });
+    if (step === 3) {
+      return (<SendConfirmation step={ step } tx={ confirmationTx } />);
+    }
+    if (step === 2) {
+      return (<QueryCode fee={ fee } isCodeValid={ isCodeValid } setCode={ setCode } />);
+    }
+    if (step === 1) {
+      return (<SendRequest step={ step } tx={ requestTx } />);
+    }
+    if (step === 0) {
+      const { setNumber, setConsentGiven } = this.state.store;
+      return (
+        <GatherData
+          fee={ fee } isNumberValid={ isNumberValid }
+          isVerified={ isVerified } hasRequested={ hasRequested }
+          setNumber={ setNumber } setConsentGiven={ setConsentGiven }
+        />
+      );
     }
-  }
 
-  renderFirstStep () {
-    const { account } = this.props;
-    const { contract, data } = this.state;
-
-    return (
-      <GatherData
-        account={ account } contract={ contract } data={ data }
-        onData={ this.onData }
-        onDataIsValid={ this.onDataIsValid }
-        onDataIsInvalid={ this.onDataIsInvalid }
-      />
-    );
-  }
-
-  renderSecondStep () {
-    const { account } = this.props;
-    const { contract, data } = this.state;
-
-    return (
-      <SendRequest
-        account={ account } contract={ contract } data={ data }
-        onData={ this.onData }
-        onSuccess={ this.onDataIsValid }
-        onError={ this.onDataIsInvalid }
-        nextStep={ this.next }
-      />
-    );
-  }
-
-  renderThirdStep () {
-    const { data } = this.state;
-
-    return (
-      <QueryCode
-        data={ data }
-        onData={ this.onData }
-        onDataIsValid={ this.onDataIsValid }
-        onDataIsInvalid={ this.onDataIsInvalid }
-      />
-    );
-  }
-
-  renderFourthStep () {
-    const { account } = this.props;
-    const { contract, data } = this.state;
-
-    return (
-      <SendConfirmation
-        account={ account } contract={ contract } data={ data }
-        onData={ this.onData }
-        onSuccess={ this.onDataIsValid }
-        onError={ this.onDataIsInvalid }
-        nextStep={ this.next }
-      />
-    );
-  }
-
-  renderFifthStep () {
-    return (<Done onSuccess={ this.onDataIsValid } />);
+    return null;
   }
 }
diff --git a/js/src/modals/SMSVerification/store.js b/js/src/modals/SMSVerification/store.js
index 669a168e6..f58f60142 100644
--- a/js/src/modals/SMSVerification/store.js
+++ b/js/src/modals/SMSVerification/store.js
@@ -60,6 +60,39 @@ export default class VerificationStore {
     return phone.isValidNumber(this.number);
   }
 
+  @computed get isStepValid () {
+    if (this.step === VerificationStore.DONE) {
+      return true;
+    }
+    if (this.error) {
+      return false;
+    }
+
+    if (this.step === VerificationStore.GATHERED_DATA) {
+      return this.fee && this.isVerified === false && this.isNumberValid && this.consentGiven;
+    }
+    if (this.step === VerificationStore.REQUESTED_SMS) {
+      return this.requestTx;
+    }
+    if (this.step === VerificationStore.QUERY_CODE) {
+      return this.isCodeValid;
+    }
+    if (this.step === VerificationStore.POSTED_CONFIRMATION) {
+      return this.confirmationTx;
+    }
+    return false;
+  }
+
+  @action setNumber = (number) => {
+    this.number = number;
+  }
+  @action setConsentGiven = (consentGiven) => {
+    this.consentGiven = consentGiven;
+  }
+  @action setCode = (code) => {
+    this.code = code;
+  }
+
   constructor (api, account) {
     this.api = api;
     this.account = account;
@@ -106,14 +139,6 @@ export default class VerificationStore {
     });
   }
 
-  @action setNumber = (number) => {
-    this.number = number;
-  }
-
-  @action setConsentGiven = (consentGiven) => {
-    this.consentGiven = consentGiven;
-  }
-
   @action sendRequest = () => {
     const { api, account, contract, fee, number, hasRequested } = this;
 
@@ -153,8 +178,8 @@ export default class VerificationStore {
       });
   }
 
-  @action setCode = (code) => {
-    this.code = code;
+  @action queryCode = () => {
+    this.step = VerificationStore.QUERY_CODE;
   }
 
   @action sendConfirmation = () => {
@@ -188,4 +213,8 @@ export default class VerificationStore {
         this.error = 'Failed to send the verification code: ' + err.message;
       });
   }
+
+  @action done = () => {
+    this.step = VerificationStore.DONE;
+  }
 }

From aa8fc554fe2b2ec440198336c50055efb946bedf Mon Sep 17 00:00:00 2001
From: Jannis R <mail@jannisr.de>
Date: Tue, 15 Nov 2016 16:59:10 +0100
Subject: [PATCH 38/57] sms verification: simplify code

- moved the steps into named exports
- moved the store creation into the Accounts component
- fix a linting issue
---
 .../modals/SMSVerification/SMSVerification.js | 37 ++++---------
 .../post-to-verification-server.js            |  2 +-
 js/src/modals/SMSVerification/store.js        | 54 +++++++++----------
 js/src/views/Account/account.js               | 19 ++++++-
 4 files changed, 55 insertions(+), 57 deletions(-)

diff --git a/js/src/modals/SMSVerification/SMSVerification.js b/js/src/modals/SMSVerification/SMSVerification.js
index 7c31e00de..c3d02c95d 100644
--- a/js/src/modals/SMSVerification/SMSVerification.js
+++ b/js/src/modals/SMSVerification/SMSVerification.js
@@ -21,14 +21,13 @@ import ContentClear from 'material-ui/svg-icons/content/clear';
 
 import { Button, IdentityIcon, Modal } from '../../ui';
 
-import VerificationStore from './store';
-const {
+import {
   GATHERING_DATA, GATHERED_DATA,
   POSTING_REQUEST, POSTED_REQUEST,
   REQUESTING_SMS, REQUESTED_SMS,
   POSTING_CONFIRMATION, POSTED_CONFIRMATION,
   DONE
-} = VerificationStore;
+} from './store';
 
 import GatherData from './GatherData';
 import SendRequest from './SendRequest';
@@ -38,12 +37,9 @@ import Done from './Done';
 
 @observer
 export default class SMSVerification extends Component {
-  static contextTypes = {
-    api: PropTypes.object.isRequired
-  }
-
   static propTypes = {
-    account: PropTypes.string,
+    store: PropTypes.any.isRequired,
+    account: PropTypes.string.isRequired,
     onClose: PropTypes.func.isRequired
   }
 
@@ -55,25 +51,13 @@ export default class SMSVerification extends Component {
     [DONE]: 4
   }
 
-  state = {
-    store: null
-  }
-
   componentDidMount () {
-    const { api } = this.context;
-    const { account } = this.props;
-
-    const store = new VerificationStore(api, account);
-    this.setState({ store }, () => {
-      store.gatherData();
-    });
+    this.props.store.gatherData();
   }
 
   render () {
-    const { store } = this.state;
-    if (!store) return null;
-    const step = SMSVerification.uiSteps[store.step];
-    const { error, isStepValid } = store;
+    const step = SMSVerification.uiSteps[this.props.store.step];
+    const { error, isStepValid } = this.props.store;
 
     return (
       <Modal
@@ -90,8 +74,7 @@ export default class SMSVerification extends Component {
   }
 
   renderDialogActions (step, error, isStepValid) {
-    const { onClose, account } = this.props;
-    const { store } = this.state;
+    const { store, account, onClose } = this.props;
 
     const cancel = (
       <Button
@@ -147,7 +130,7 @@ export default class SMSVerification extends Component {
       fee, isNumberValid, isVerified, hasRequested,
       requestTx, isCodeValid, confirmationTx,
       setNumber, setConsentGiven, setCode
-    } = this.state.store;
+    } = this.props.store;
 
     if (step === 4) {
       return (<Done />);
@@ -162,7 +145,7 @@ export default class SMSVerification extends Component {
       return (<SendRequest step={ step } tx={ requestTx } />);
     }
     if (step === 0) {
-      const { setNumber, setConsentGiven } = this.state.store;
+      const { setNumber, setConsentGiven } = this.props.store;
       return (
         <GatherData
           fee={ fee } isNumberValid={ isNumberValid }
diff --git a/js/src/modals/SMSVerification/post-to-verification-server.js b/js/src/modals/SMSVerification/post-to-verification-server.js
index c989e84e9..649bd4fc7 100644
--- a/js/src/modals/SMSVerification/post-to-verification-server.js
+++ b/js/src/modals/SMSVerification/post-to-verification-server.js
@@ -31,7 +31,7 @@ const postToVerificationServer = (query) => {
   })
   .catch((err) => {
     console.error('foooo', err.stack);
-    throw err
+    throw err;
   });
 };
 
diff --git a/js/src/modals/SMSVerification/store.js b/js/src/modals/SMSVerification/store.js
index f58f60142..01c775c3a 100644
--- a/js/src/modals/SMSVerification/store.js
+++ b/js/src/modals/SMSVerification/store.js
@@ -29,18 +29,18 @@ import postToVerificationServer from './post-to-verification-server';
 
 const validCode = /^[A-Z0-9_-]{7,14}$/i;
 
-export default class VerificationStore {
-  static GATHERING_DATA = 'gathering-data';
-  static GATHERED_DATA = 'gathered-data';
-  static POSTING_REQUEST = 'posting-request';
-  static POSTED_REQUEST = 'posted-request';
-  static REQUESTING_SMS = 'requesting-sms';
-  static REQUESTED_SMS = 'requested-sms';
-  static QUERY_CODE = 'query-code';
-  static POSTING_CONFIRMATION = 'posting-confirmation';
-  static POSTED_CONFIRMATION = 'posted-confirmation';
-  static DONE = 'done';
+export const GATHERING_DATA = 'gathering-data';
+export const GATHERED_DATA = 'gathered-data';
+export const POSTING_REQUEST = 'posting-request';
+export const POSTED_REQUEST = 'posted-request';
+export const REQUESTING_SMS = 'requesting-sms';
+export const REQUESTED_SMS = 'requested-sms';
+export const QUERY_CODE = 'query-code';
+export const POSTING_CONFIRMATION = 'posting-confirmation';
+export const POSTED_CONFIRMATION = 'posted-confirmation';
+export const DONE = 'done';
 
+export default class VerificationStore {
   @observable step = null;
   @observable error = null;
 
@@ -61,23 +61,23 @@ export default class VerificationStore {
   }
 
   @computed get isStepValid () {
-    if (this.step === VerificationStore.DONE) {
+    if (this.step === DONE) {
       return true;
     }
     if (this.error) {
       return false;
     }
 
-    if (this.step === VerificationStore.GATHERED_DATA) {
+    if (this.step === GATHERED_DATA) {
       return this.fee && this.isVerified === false && this.isNumberValid && this.consentGiven;
     }
-    if (this.step === VerificationStore.REQUESTED_SMS) {
+    if (this.step === REQUESTED_SMS) {
       return this.requestTx;
     }
-    if (this.step === VerificationStore.QUERY_CODE) {
+    if (this.step === QUERY_CODE) {
       return this.isCodeValid;
     }
-    if (this.step === VerificationStore.POSTED_CONFIRMATION) {
+    if (this.step === POSTED_CONFIRMATION) {
       return this.confirmationTx;
     }
     return false;
@@ -107,7 +107,7 @@ export default class VerificationStore {
 
   @action gatherData = () => {
     const { contract, account } = this;
-    this.step = VerificationStore.GATHERING_DATA;
+    this.step = GATHERING_DATA;
 
     const fee = contract.instance.fee.call()
       .then((fee) => {
@@ -135,7 +135,7 @@ export default class VerificationStore {
 
     Promise.all([ fee, isVerified, hasRequested ])
     .then(() => {
-      this.step = VerificationStore.GATHERED_DATA;
+      this.step = GATHERED_DATA;
     });
   }
 
@@ -147,7 +147,7 @@ export default class VerificationStore {
 
     let chain = Promise.resolve();
     if (!hasRequested) {
-      this.step = VerificationStore.POSTING_REQUEST;
+      this.step = POSTING_REQUEST;
       chain = request.estimateGas(options, [])
         .then((gas) => {
           options.gas = gas.mul(1.2).toFixed(0);
@@ -160,18 +160,18 @@ export default class VerificationStore {
         })
         .then((txHash) => {
           this.requestTx = txHash;
-          this.step = VerificationStore.POSTED_REQUEST;
+          this.step = POSTED_REQUEST;
           return waitForConfirmations(api, txHash, 1);
         });
     }
 
     chain
       .then(() => {
-        this.step = VerificationStore.REQUESTING_SMS;
+        this.step = REQUESTING_SMS;
         return postToVerificationServer({ number, address: account });
       })
       .then(() => {
-        this.step = VerificationStore.REQUESTED_SMS;
+        this.step = REQUESTED_SMS;
       })
       .catch((err) => {
         this.error = 'Failed to request a confirmation SMS: ' + err.message;
@@ -179,7 +179,7 @@ export default class VerificationStore {
   }
 
   @action queryCode = () => {
-    this.step = VerificationStore.QUERY_CODE;
+    this.step = QUERY_CODE;
   }
 
   @action sendConfirmation = () => {
@@ -190,7 +190,7 @@ export default class VerificationStore {
     const options = { from: account };
     const values = [ token ];
 
-    this.step = VerificationStore.POSTING_CONFIRMATION;
+    this.step = POSTING_CONFIRMATION;
     confirm.estimateGas(options, values)
       .then((gas) => {
         options.gas = gas.mul(1.2).toFixed(0);
@@ -203,11 +203,11 @@ export default class VerificationStore {
       })
       .then((txHash) => {
         this.confirmationTx = txHash;
-        this.step = VerificationStore.POSTED_CONFIRMATION;
+        this.step = POSTED_CONFIRMATION;
         return waitForConfirmations(api, txHash, 2);
       })
       .then(() => {
-        this.step = VerificationStore.DONE;
+        this.step = DONE;
       })
       .catch((err) => {
         this.error = 'Failed to send the verification code: ' + err.message;
@@ -215,6 +215,6 @@ export default class VerificationStore {
   }
 
   @action done = () => {
-    this.step = VerificationStore.DONE;
+    this.step = DONE;
   }
 }
diff --git a/js/src/views/Account/account.js b/js/src/views/Account/account.js
index 24c0b44cb..86a76073e 100644
--- a/js/src/views/Account/account.js
+++ b/js/src/views/Account/account.js
@@ -30,9 +30,15 @@ import shapeshiftBtn from '../../../assets/images/shapeshift-btn.png';
 import Header from './Header';
 import Transactions from './Transactions';
 
+import VerificationStore from '../../modals/SMSVerification/store';
+
 import styles from './account.css';
 
 class Account extends Component {
+  static contextTypes = {
+    api: PropTypes.object.isRequired
+  }
+
   static propTypes = {
     params: PropTypes.object,
     accounts: PropTypes.object,
@@ -47,10 +53,19 @@ class Account extends Component {
     showEditDialog: false,
     showFundDialog: false,
     showVerificationDialog: false,
+    verificationStore: null,
     showTransferDialog: false,
     showPasswordDialog: false
   }
 
+  componentDidMount () {
+    const { api } = this.context;
+    const { address } = this.props.params;
+
+    const store = new VerificationStore(api, address);
+    this.setState({ verificationStore: store });
+  }
+
   render () {
     const { accounts, balances, isTest } = this.props;
     const { address } = this.props.params;
@@ -162,12 +177,12 @@ class Account extends Component {
       return null;
     }
 
+    const store = this.state.verificationStore;
     const { address } = this.props.params;
 
-    // TODO: pass props
     return (
       <SMSVerification
-        account={ address }
+        store={ store } account={ address }
         onClose={ this.onVerificationClose }
       />
     );

From 8d4b1a332b9d1581e4c4be9ac484ffb4ba1ab79f Mon Sep 17 00:00:00 2001
From: Jannis R <mail@jannisr.de>
Date: Tue, 15 Nov 2016 19:05:16 +0100
Subject: [PATCH 39/57] sms verification: bugfixes :bug:

- fixed imports
- renamed `uiSteps` to `phases` to make the distinction between
  actual (tiny) steps and visible UI steps clear
- lookup `requestTx` if request has already been sent
- change code regex to match ethcore/sms-verification@59acb73
---
 .../modals/SMSVerification/SMSVerification.js | 44 +++++++++++--------
 .../SendConfirmation/sendConfirmation.js      |  5 +--
 .../SendRequest/sendRequest.js                |  5 +--
 .../SMSVerification/check-if-requested.js     |  5 ++-
 .../post-to-verification-server.js            |  4 --
 js/src/modals/SMSVerification/store.js        |  9 ++--
 .../SMSVerification/wait-for-confirmations.js |  4 +-
 7 files changed, 41 insertions(+), 35 deletions(-)

diff --git a/js/src/modals/SMSVerification/SMSVerification.js b/js/src/modals/SMSVerification/SMSVerification.js
index c3d02c95d..dbdb7625f 100644
--- a/js/src/modals/SMSVerification/SMSVerification.js
+++ b/js/src/modals/SMSVerification/SMSVerification.js
@@ -43,7 +43,7 @@ export default class SMSVerification extends Component {
     onClose: PropTypes.func.isRequired
   }
 
-  static uiSteps = { // mapping (store steps -> steps)
+  static phases = { // mapping (store steps -> steps)
     [GATHERING_DATA]: 0, [GATHERED_DATA]: 0,
     [POSTING_REQUEST]: 1, [POSTED_REQUEST]: 1, [REQUESTING_SMS]: 1,
     [REQUESTED_SMS]: 2,
@@ -56,24 +56,24 @@ export default class SMSVerification extends Component {
   }
 
   render () {
-    const step = SMSVerification.uiSteps[this.props.store.step];
+    const phase = SMSVerification.phases[this.props.store.step];
     const { error, isStepValid } = this.props.store;
 
     return (
       <Modal
-        actions={ this.renderDialogActions(step, error, isStepValid) }
+        actions={ this.renderDialogActions(phase, error, isStepValid) }
         title='verify your account via SMS'
         visible scroll
-        current={ step }
+        current={ phase }
         steps={ ['Enter Data', 'Request', 'Enter Code', 'Confirm', 'Done!'] }
         waiting={ [ 1, 3 ] }
       >
-        { this.renderStep(step, error) }
+        { this.renderStep(phase, error) }
       </Modal>
     );
   }
 
-  renderDialogActions (step, error, isStepValid) {
+  renderDialogActions (phase, error, isStepValid) {
     const { store, account, onClose } = this.props;
 
     const cancel = (
@@ -85,7 +85,7 @@ export default class SMSVerification extends Component {
     );
     if (error) return (<div>{ cancel }</div>);
 
-    if (step === 4) {
+    if (phase === 4) {
       return (
         <div>
           { cancel }
@@ -100,13 +100,13 @@ export default class SMSVerification extends Component {
     }
 
     let action;
-    if (step === 3) {
+    if (phase === 3) {
       action = store.done;
-    } else if (step === 2) {
+    } else if (phase === 2) {
       action = store.sendConfirmation;
-    } else if (step === 1) {
+    } else if (phase === 1) {
       action = store.queryCode;
-    } else if (step === 0) {
+    } else if (phase === 0) {
       action = store.sendRequest;
     }
 
@@ -123,28 +123,34 @@ export default class SMSVerification extends Component {
     );
   }
 
-  renderStep (step, error) {
+  renderStep (phase, error) {
     if (error) return (<p>{ error }</p>);
 
     const {
-      fee, isNumberValid, isVerified, hasRequested,
+      step,
+      fee, number, isNumberValid, isVerified, hasRequested,
       requestTx, isCodeValid, confirmationTx,
       setNumber, setConsentGiven, setCode
     } = this.props.store;
 
-    if (step === 4) {
+    if (phase === 4) {
       return (<Done />);
     }
-    if (step === 3) {
+    if (phase === 3) {
       return (<SendConfirmation step={ step } tx={ confirmationTx } />);
     }
-    if (step === 2) {
-      return (<QueryCode fee={ fee } isCodeValid={ isCodeValid } setCode={ setCode } />);
+    if (phase === 2) {
+      return (
+        <QueryCode
+          number={ number } fee={ fee } isCodeValid={ isCodeValid }
+          setCode={ setCode }
+        />
+      );
     }
-    if (step === 1) {
+    if (phase === 1) {
       return (<SendRequest step={ step } tx={ requestTx } />);
     }
-    if (step === 0) {
+    if (phase === 0) {
       const { setNumber, setConsentGiven } = this.props.store;
       return (
         <GatherData
diff --git a/js/src/modals/SMSVerification/SendConfirmation/sendConfirmation.js b/js/src/modals/SMSVerification/SendConfirmation/sendConfirmation.js
index 9e531f6a9..b6d4f3dca 100644
--- a/js/src/modals/SMSVerification/SendConfirmation/sendConfirmation.js
+++ b/js/src/modals/SMSVerification/SendConfirmation/sendConfirmation.js
@@ -17,10 +17,9 @@
 import React, { Component, PropTypes } from 'react';
 
 import TxHash from '../../../ui/TxHash';
-import VerificationStore from '../store';
-const {
+import {
   POSTING_CONFIRMATION, POSTED_CONFIRMATION
-} = VerificationStore;
+} from '../store';
 
 import styles from './sendConfirmation.css';
 
diff --git a/js/src/modals/SMSVerification/SendRequest/sendRequest.js b/js/src/modals/SMSVerification/SendRequest/sendRequest.js
index 482eac679..91c857a6a 100644
--- a/js/src/modals/SMSVerification/SendRequest/sendRequest.js
+++ b/js/src/modals/SMSVerification/SendRequest/sendRequest.js
@@ -17,10 +17,9 @@
 import React, { Component, PropTypes } from 'react';
 
 import TxHash from '../../../ui/TxHash';
-import VerificationStore from '../store';
-const {
+import {
   POSTING_REQUEST, POSTED_REQUEST, REQUESTING_SMS
-} = VerificationStore;
+} from '../store';
 
 import styles from './sendRequest.css';
 
diff --git a/js/src/modals/SMSVerification/check-if-requested.js b/js/src/modals/SMSVerification/check-if-requested.js
index 8f1d8cc57..608022541 100644
--- a/js/src/modals/SMSVerification/check-if-requested.js
+++ b/js/src/modals/SMSVerification/check-if-requested.js
@@ -22,9 +22,10 @@ const checkIfRequested = (contract, account) => {
       if (err) {
         return reject(err);
       }
-      resolve(logs.some((l) => {
+      const e = logs.find((l) => {
         return l.type === 'mined' && l.params.who && l.params.who.value === account;
-      }));
+      });
+      resolve(e ? e.transactionHash : false);
     });
   });
 };
diff --git a/js/src/modals/SMSVerification/post-to-verification-server.js b/js/src/modals/SMSVerification/post-to-verification-server.js
index 649bd4fc7..b7889f3e0 100644
--- a/js/src/modals/SMSVerification/post-to-verification-server.js
+++ b/js/src/modals/SMSVerification/post-to-verification-server.js
@@ -28,10 +28,6 @@ const postToVerificationServer = (query) => {
       }
       throw new Error(data.message || 'unknown error');
     });
-  })
-  .catch((err) => {
-    console.error('foooo', err.stack);
-    throw err;
   });
 };
 
diff --git a/js/src/modals/SMSVerification/store.js b/js/src/modals/SMSVerification/store.js
index 01c775c3a..2d4aa099b 100644
--- a/js/src/modals/SMSVerification/store.js
+++ b/js/src/modals/SMSVerification/store.js
@@ -27,7 +27,7 @@ import checkIfRequested from './check-if-requested';
 import waitForConfirmations from './wait-for-confirmations';
 import postToVerificationServer from './post-to-verification-server';
 
-const validCode = /^[A-Z0-9_-]{7,14}$/i;
+const validCode = /^[A-Z\s]+$/i;
 
 export const GATHERING_DATA = 'gathering-data';
 export const GATHERED_DATA = 'gathered-data';
@@ -126,8 +126,11 @@ export default class VerificationStore {
       });
 
     const hasRequested = checkIfRequested(contract, account)
-      .then((hasRequested) => {
-        this.hasRequested = hasRequested;
+      .then((txHash) => {
+        this.hasRequested = !!txHash;
+        if (txHash) {
+          this.requestTx = txHash;
+        }
       })
       .catch((err) => {
         this.error = 'Failed to check if requested: ' + err.message;
diff --git a/js/src/modals/SMSVerification/wait-for-confirmations.js b/js/src/modals/SMSVerification/wait-for-confirmations.js
index e99d3d173..79ba2be25 100644
--- a/js/src/modals/SMSVerification/wait-for-confirmations.js
+++ b/js/src/modals/SMSVerification/wait-for-confirmations.js
@@ -27,7 +27,9 @@ const waitForConfirmations = (api, tx, confirmations) => {
         if (err) {
           reject(err);
         } else if (block.minus(confirmations - 1).gte(receipt.blockNumber)) {
-          api.unsubscribe(subscription);
+          if (subscription) {
+            api.unsubscribe(subscription);
+          }
           resolve();
         }
       })

From da8c70fbe7715c88d2363ec84b24f5a42736f6a4 Mon Sep 17 00:00:00 2001
From: Jannis R <mail@jannisr.de>
Date: Wed, 16 Nov 2016 13:28:51 +0100
Subject: [PATCH 40/57] sms verification: check if tx failed, minor UI fixes

- checks if the tx failed by the amount of gas used
- don't show the pending indicator if an error occured
---
 .../modals/SMSVerification/SMSVerification.js |  2 +-
 .../SMSVerification/check-if-tx-failed.js     | 28 +++++++++++++++++++
 js/src/modals/SMSVerification/store.js        | 21 +++++++++++---
 3 files changed, 46 insertions(+), 5 deletions(-)
 create mode 100644 js/src/modals/SMSVerification/check-if-tx-failed.js

diff --git a/js/src/modals/SMSVerification/SMSVerification.js b/js/src/modals/SMSVerification/SMSVerification.js
index dbdb7625f..3575fc76a 100644
--- a/js/src/modals/SMSVerification/SMSVerification.js
+++ b/js/src/modals/SMSVerification/SMSVerification.js
@@ -66,7 +66,7 @@ export default class SMSVerification extends Component {
         visible scroll
         current={ phase }
         steps={ ['Enter Data', 'Request', 'Enter Code', 'Confirm', 'Done!'] }
-        waiting={ [ 1, 3 ] }
+        waiting={ error ? [] : [ 1, 3 ] }
       >
         { this.renderStep(phase, error) }
       </Modal>
diff --git a/js/src/modals/SMSVerification/check-if-tx-failed.js b/js/src/modals/SMSVerification/check-if-tx-failed.js
new file mode 100644
index 000000000..39689bedd
--- /dev/null
+++ b/js/src/modals/SMSVerification/check-if-tx-failed.js
@@ -0,0 +1,28 @@
+// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+const checkIfTxFailed = (api, tx, gasSent) => {
+  return api.pollMethod('eth_getTransactionReceipt', tx)
+  .then((receipt) => {
+    // TODO: Right now, there's no way to tell wether the EVM code crashed.
+    // Because you usually send a bit more gas than estimated (to make sure
+    // it gets mined quickly), we transaction probably failed if all the gas
+    // has been used up.
+    return receipt.gasUsed.eq(gasSent);
+  });
+};
+
+export default checkIfTxFailed;
diff --git a/js/src/modals/SMSVerification/store.js b/js/src/modals/SMSVerification/store.js
index 2d4aa099b..d8a1247e5 100644
--- a/js/src/modals/SMSVerification/store.js
+++ b/js/src/modals/SMSVerification/store.js
@@ -24,6 +24,7 @@ const contract = '0xcE381B876A85A72303f7cA7b3a012f58F4CEEEeB';
 
 import checkIfVerified from './check-if-verified';
 import checkIfRequested from './check-if-requested';
+import checkIfTxFailed from './check-if-tx-failed';
 import waitForConfirmations from './wait-for-confirmations';
 import postToVerificationServer from './post-to-verification-server';
 
@@ -163,8 +164,14 @@ export default class VerificationStore {
         })
         .then((txHash) => {
           this.requestTx = txHash;
-          this.step = POSTED_REQUEST;
-          return waitForConfirmations(api, txHash, 1);
+          return checkIfTxFailed(api, txHash, options.gas)
+          .then((hasFailed) => {
+            if (hasFailed) {
+              throw new Error('Transaction failed, all gas used up.');
+            }
+            this.step = POSTED_REQUEST;
+            return waitForConfirmations(api, txHash, 1);
+          });
         });
     }
 
@@ -206,8 +213,14 @@ export default class VerificationStore {
       })
       .then((txHash) => {
         this.confirmationTx = txHash;
-        this.step = POSTED_CONFIRMATION;
-        return waitForConfirmations(api, txHash, 2);
+        return checkIfTxFailed(api, txHash, options.gas)
+        .then((hasFailed) => {
+          if (hasFailed) {
+            throw new Error('Transaction failed, all gas used up.');
+          }
+          this.step = POSTED_CONFIRMATION;
+          return waitForConfirmations(api, txHash, 1);
+        });
       })
       .then(() => {
         this.step = DONE;

From 5bddcd8003fde9b7829653b7c6ac5d969f868b4b Mon Sep 17 00:00:00 2001
From: arkpar <arkady.paronyan@gmail.com>
Date: Wed, 16 Nov 2016 19:34:12 +0100
Subject: [PATCH 41/57] Sync bandwidth optimization

---
 sync/src/block_sync.rs | 46 +++++++++++++++++++++++++++++-------------
 sync/src/blocks.rs     |  7 ++++++-
 sync/src/chain.rs      | 38 +++++++++++++++++++++++-----------
 3 files changed, 64 insertions(+), 27 deletions(-)

diff --git a/sync/src/block_sync.rs b/sync/src/block_sync.rs
index 277067537..7c3cbf2d7 100644
--- a/sync/src/block_sync.rs
+++ b/sync/src/block_sync.rs
@@ -33,6 +33,7 @@ const MAX_BODIES_TO_REQUEST: usize = 64;
 const MAX_RECEPITS_TO_REQUEST: usize = 128;
 const SUBCHAIN_SIZE: u64 = 256;
 const MAX_ROUND_PARENTS: usize = 32;
+const MAX_PARALLEL_SUBCHAIN_DOWNLOAD: usize = 5;
 
 #[derive(Copy, Clone, Eq, PartialEq, Debug)]
 /// Downloader state
@@ -62,6 +63,14 @@ pub enum BlockRequest {
 	},
 }
 
+/// Indicates sync action
+pub enum DownloadAction {
+	/// Do nothing
+	None,
+	/// Reset downloads for all peers
+	Reset
+}
+
 #[derive(Eq, PartialEq, Debug)]
 pub enum BlockDownloaderImportError {
 	/// Imported data is rejected as invalid.
@@ -175,11 +184,11 @@ impl BlockDownloader {
 	}
 
 	/// Add new block headers.
-	pub fn import_headers(&mut self, io: &mut SyncIo, r: &UntrustedRlp, expected_hash: Option<H256>) -> Result<(), BlockDownloaderImportError> {
+	pub fn import_headers(&mut self, io: &mut SyncIo, r: &UntrustedRlp, expected_hash: Option<H256>) -> Result<DownloadAction, BlockDownloaderImportError> {
 		let item_count = r.item_count();
 		if self.state == State::Idle {
 			trace!(target: "sync", "Ignored unexpected block headers");
-			return Ok(())
+			return Ok(DownloadAction::None)
 		}
 		if item_count == 0 && (self.state == State::Blocks) {
 			return Err(BlockDownloaderImportError::Invalid);
@@ -188,6 +197,7 @@ impl BlockDownloader {
 		let mut headers = Vec::new();
 		let mut hashes = Vec::new();
 		let mut valid_response = item_count == 0; //empty response is valid
+		let mut any_known = false;
 		for i in 0..item_count {
 			let info: BlockHeader = try!(r.val_at(i).map_err(|e| {
 				trace!(target: "sync", "Error decoding block header RLP: {:?}", e);
@@ -200,6 +210,7 @@ impl BlockDownloader {
 					valid_response = expected == info.hash()
 				}
 			}
+			any_known = any_known || self.blocks.contains_head(&info.hash());
 			if self.blocks.contains(&info.hash()) {
 				trace!(target: "sync", "Skipping existing block header {} ({:?})", number, info.hash());
 				continue;
@@ -245,17 +256,22 @@ impl BlockDownloader {
 					trace!(target: "sync", "Received {} subchain heads, proceeding to download", headers.len());
 					self.blocks.reset_to(hashes);
 					self.state = State::Blocks;
+					return Ok(DownloadAction::Reset);
 				}
 			},
 			State::Blocks => {
 				let count = headers.len();
+				// At least one of the heades must advance the subchain. Otherwise they are all useless.
+				if !any_known {
+					return Err(BlockDownloaderImportError::Useless);
+				}
 				self.blocks.insert_headers(headers);
 				trace!(target: "sync", "Inserted {} headers", count);
 			},
 			_ => trace!(target: "sync", "Unexpected headers({})", headers.len()),
 		}
 
-		Ok(())
+		Ok(DownloadAction::None)
 	}
 
 	/// Called by peer once it has new block bodies
@@ -342,22 +358,24 @@ impl BlockDownloader {
 	}
 
 	/// Find some headers or blocks to download for a peer.
-	pub fn request_blocks(&mut self, io: &mut SyncIo) -> Option<BlockRequest> {
+	pub fn request_blocks(&mut self, io: &mut SyncIo, num_active_peers: usize) -> Option<BlockRequest> {
 		match self.state {
 			State::Idle => {
 				self.start_sync_round(io);
-				return self.request_blocks(io);
+				return self.request_blocks(io, num_active_peers);
 			},
 			State::ChainHead => {
-				// Request subchain headers
-				trace!(target: "sync", "Starting sync with better chain");
-				// Request MAX_HEADERS_TO_REQUEST - 2 headers apart so that
-				// MAX_HEADERS_TO_REQUEST would include headers for neighbouring subchains
-				return Some(BlockRequest::Headers {
-					start: self.last_imported_hash.clone(),
-					count: SUBCHAIN_SIZE,
-					skip: (MAX_HEADERS_TO_REQUEST - 2) as u64,
-				});
+				if num_active_peers < MAX_PARALLEL_SUBCHAIN_DOWNLOAD {
+					// Request subchain headers
+					trace!(target: "sync", "Starting sync with better chain");
+					// Request MAX_HEADERS_TO_REQUEST - 2 headers apart so that
+					// MAX_HEADERS_TO_REQUEST would include headers for neighbouring subchains
+					return Some(BlockRequest::Headers {
+						start: self.last_imported_hash.clone(),
+						count: SUBCHAIN_SIZE,
+						skip: (MAX_HEADERS_TO_REQUEST - 2) as u64,
+					});
+				}
 			},
 			State::Blocks => {
 				// check to see if we need to download any block bodies first
diff --git a/sync/src/blocks.rs b/sync/src/blocks.rs
index ed608d9c1..bf0c4b244 100644
--- a/sync/src/blocks.rs
+++ b/sync/src/blocks.rs
@@ -301,11 +301,16 @@ impl BlockCollection {
 		self.heads.len() == 0 || (self.heads.len() == 1 && self.head.map_or(false, |h| h == self.heads[0]))
 	}
 
-	/// Chech is collection contains a block header.
+	/// Check if collection contains a block header.
 	pub fn contains(&self, hash: &H256) -> bool {
 		self.blocks.contains_key(hash)
 	}
 
+	/// Check if collection contains a block header.
+	pub fn contains_head(&self, hash: &H256) -> bool {
+		self.heads.contains(hash)
+	}
+
 	/// Return used heap size.
 	pub fn heap_size(&self) -> usize {
 		self.heads.heap_size_of_children()
diff --git a/sync/src/chain.rs b/sync/src/chain.rs
index 2f810e754..d780eb446 100644
--- a/sync/src/chain.rs
+++ b/sync/src/chain.rs
@@ -98,7 +98,7 @@ use ethcore::snapshot::{ManifestData, RestorationStatus};
 use sync_io::SyncIo;
 use time;
 use super::SyncConfig;
-use block_sync::{BlockDownloader, BlockRequest, BlockDownloaderImportError as DownloaderImportError};
+use block_sync::{BlockDownloader, BlockRequest, BlockDownloaderImportError as DownloaderImportError, DownloadAction};
 use snapshot::{Snapshot, ChunkType};
 use rand::{thread_rng, Rng};
 use api::{PeerInfo as PeerInfoDigest, WARP_SYNC_PROTOCOL_ID};
@@ -306,6 +306,15 @@ impl PeerInfo {
 	fn is_allowed(&self) -> bool {
 		self.confirmation != ForkConfirmation::Unconfirmed && !self.expired
 	}
+
+	fn reset_asking(&mut self) {
+		self.asking_blocks.clear();
+		self.asking_hash = None;
+		// mark any pending requests as expired
+		if self.asking != PeerAsking::Nothing && self.is_allowed() {
+			self.expired = true;
+		}
+	}
 }
 
 /// Blockchain sync handler.
@@ -425,12 +434,7 @@ impl ChainSync {
 		}
 		for (_, ref mut p) in &mut self.peers {
 			if p.block_set != Some(BlockSet::OldBlocks) {
-				p.asking_blocks.clear();
-				p.asking_hash = None;
-				// mark any pending requests as expired
-				if p.asking != PeerAsking::Nothing && p.is_allowed() {
-					p.expired = true;
-				}
+				p.reset_asking();
 			}
 		}
 		self.state = SyncState::Idle;
@@ -641,8 +645,9 @@ impl ChainSync {
 
 		self.clear_peer_download(peer_id);
 		let expected_hash = self.peers.get(&peer_id).and_then(|p| p.asking_hash);
+		let allowed = self.peers.get(&peer_id).map(|p| p.is_allowed()).unwrap_or(false);
 		let block_set = self.peers.get(&peer_id).and_then(|p| p.block_set).unwrap_or(BlockSet::NewBlocks);
-		if !self.reset_peer_asking(peer_id, PeerAsking::BlockHeaders) || expected_hash.is_none() {
+		if !self.reset_peer_asking(peer_id, PeerAsking::BlockHeaders) || expected_hash.is_none() || !allowed {
 			trace!(target: "sync", "{}: Ignored unexpected headers, expected_hash = {:?}", peer_id, expected_hash);
 			self.continue_sync(io);
 			return Ok(());
@@ -687,7 +692,15 @@ impl ChainSync {
 				self.continue_sync(io);
 				return Ok(());
 			},
-			Ok(()) => (),
+			Ok(DownloadAction::Reset) => {
+				// mark all outstanding requests as expired
+				trace!("Resetting downloads for {:?}", block_set);
+				for (_, ref mut p) in self.peers.iter_mut().filter(|&(_, ref p)| p.block_set == Some(block_set)) {
+					p.reset_asking();
+				}
+
+			}
+			Ok(DownloadAction::None) => {},
 		}
 
 		self.collect_blocks(io, block_set);
@@ -979,7 +992,7 @@ impl ChainSync {
 			return Ok(());
 		}
 		self.clear_peer_download(peer_id);
-		if !self.reset_peer_asking(peer_id, PeerAsking::SnapshotData) || self.state != SyncState::SnapshotData {
+		if !self.reset_peer_asking(peer_id, PeerAsking::SnapshotData) || (self.state != SyncState::SnapshotData && self.state != SyncState::SnapshotWaiting) {
 			trace!(target: "sync", "{}: Ignored unexpected snapshot data", peer_id);
 			self.continue_sync(io);
 			return Ok(());
@@ -1111,6 +1124,7 @@ impl ChainSync {
 		};
 		let chain_info = io.chain().chain_info();
 		let syncing_difficulty = chain_info.pending_total_difficulty;
+		let num_active_peers = self.peers.values().filter(|p| p.asking != PeerAsking::Nothing).count();
 
 		let higher_difficulty = peer_difficulty.map_or(true, |pd| pd > syncing_difficulty);
 		if force || self.state == SyncState::NewBlocks || higher_difficulty || self.old_blocks.is_some() {
@@ -1128,7 +1142,7 @@ impl ChainSync {
 					let have_latest = io.chain().block_status(BlockID::Hash(peer_latest)) != BlockStatus::Unknown;
 					if !have_latest && (higher_difficulty || force || self.state == SyncState::NewBlocks) {
 						// check if got new blocks to download
-						if let Some(request) = self.new_blocks.request_blocks(io) {
+						if let Some(request) = self.new_blocks.request_blocks(io, num_active_peers) {
 							self.request_blocks(io, peer_id, request, BlockSet::NewBlocks);
 							if self.state == SyncState::Idle {
 								self.state = SyncState::Blocks;
@@ -1137,7 +1151,7 @@ impl ChainSync {
 						}
 					}
 
-					if let Some(request) = self.old_blocks.as_mut().and_then(|d| d.request_blocks(io)) {
+					if let Some(request) = self.old_blocks.as_mut().and_then(|d| d.request_blocks(io, num_active_peers)) {
 						self.request_blocks(io, peer_id, request, BlockSet::OldBlocks);
 						return;
 					}

From 2928da07e48d59b9b8718ece1b27ab20426fdc4b Mon Sep 17 00:00:00 2001
From: Arkadiy Paronyan <arkady.paronyan@gmail.com>
Date: Thu, 17 Nov 2016 12:30:56 +0100
Subject: [PATCH 42/57] sudo -c Is not supported on Mac

---
 mac/install-readme.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mac/install-readme.txt b/mac/install-readme.txt
index efc86ffdf..5a6de4580 100644
--- a/mac/install-readme.txt
+++ b/mac/install-readme.txt
@@ -14,7 +14,7 @@ To temporarily disable Parity Wallet (and stop Parity) use:
 
 To completely uninstall Parity Wallet use:
 
-	sudo -c /usr/local/libexec/uninstall-parity.sh
+	sudo /usr/local/libexec/uninstall-parity.sh
 
 
-Parity is distributed under the terms of the GPL.
\ No newline at end of file
+Parity is distributed under the terms of the GPL.

From 13448930e9276852dac22b7a58c926c0e47a8f02 Mon Sep 17 00:00:00 2001
From: Jannis R <mail@jannisr.de>
Date: Thu, 17 Nov 2016 12:26:59 +0100
Subject: [PATCH 43/57] sms verification: fix styling :sparkles:

---
 js/src/contracts/abi/index.js                 |  2 +
 js/src/modals/SMSVerification/Done/done.css   |  1 +
 .../SMSVerification/GatherData/gatherData.css | 16 ++--
 .../SMSVerification/GatherData/gatherData.js  | 11 ++-
 .../SMSVerification/QueryCode/queryCode.js    |  1 +
 .../modals/SMSVerification/SMSVerification.js | 29 ++++---
 .../SendRequest/sendRequest.js                | 32 ++++----
 js/src/modals/SMSVerification/store.js        | 82 ++++++++++---------
 js/src/ui/TxHash/txHash.js                    |  4 +-
 9 files changed, 101 insertions(+), 77 deletions(-)

diff --git a/js/src/contracts/abi/index.js b/js/src/contracts/abi/index.js
index 80f49dc5b..dda43775e 100644
--- a/js/src/contracts/abi/index.js
+++ b/js/src/contracts/abi/index.js
@@ -23,6 +23,7 @@ import githubhint from './githubhint.json';
 import owned from './owned.json';
 import registry from './registry.json';
 import signaturereg from './signaturereg.json';
+import smsVerification from './sms-verification.json';
 import tokenreg from './tokenreg.json';
 import wallet from './wallet.json';
 
@@ -36,6 +37,7 @@ export {
   owned,
   registry,
   signaturereg,
+  smsVerification,
   tokenreg,
   wallet
 };
diff --git a/js/src/modals/SMSVerification/Done/done.css b/js/src/modals/SMSVerification/Done/done.css
index 4bd7697fb..18c410f3e 100644
--- a/js/src/modals/SMSVerification/Done/done.css
+++ b/js/src/modals/SMSVerification/Done/done.css
@@ -23,6 +23,7 @@
   display: flex;
   align-items: center;
 }
+
 .message {
   margin-top: 0;
   margin-bottom: 0;
diff --git a/js/src/modals/SMSVerification/GatherData/gatherData.css b/js/src/modals/SMSVerification/GatherData/gatherData.css
index 8d3fd6c77..680986981 100644
--- a/js/src/modals/SMSVerification/GatherData/gatherData.css
+++ b/js/src/modals/SMSVerification/GatherData/gatherData.css
@@ -37,11 +37,13 @@
 .terms {
   line-height: 1.3;
   opacity: .7;
-}
-.terms ul {
-  padding-left: 1.5em;
-}
-.terms li {
-  margin-top: .2em;
-  margin-bottom: .2em;
+
+  ul {
+    padding-left: 1.5em;
+  }
+
+  li {
+    margin-top: .2em;
+    margin-bottom: .2em;
+  }
 }
diff --git a/js/src/modals/SMSVerification/GatherData/gatherData.js b/js/src/modals/SMSVerification/GatherData/gatherData.js
index c89263bd9..fa24e04e5 100644
--- a/js/src/modals/SMSVerification/GatherData/gatherData.js
+++ b/js/src/modals/SMSVerification/GatherData/gatherData.js
@@ -96,8 +96,7 @@ export default class GatherData extends Component {
           <p className={ styles.message }>Your account is already verified.</p>
         </div>
       );
-    }
-    if (isVerified === false) {
+    } else if (isVerified === false) {
       return (
         <div className={ styles.container }>
           <SuccessIcon />
@@ -105,7 +104,9 @@ export default class GatherData extends Component {
         </div>
       );
     }
-    return (<p className={ styles.message }>Checking if your account is verified…</p>);
+    return (
+      <p className={ styles.message }>Checking if your account is verified…</p>
+    );
   }
 
   renderRequested () {
@@ -132,7 +133,9 @@ export default class GatherData extends Component {
         </div>
       );
     }
-    return (<p className={ styles.message }>Checking if you requested verification…</p>);
+    return (
+      <p className={ styles.message }>Checking if you requested verification…</p>
+    );
   }
 
   numberOnSubmit = (value) => {
diff --git a/js/src/modals/SMSVerification/QueryCode/queryCode.js b/js/src/modals/SMSVerification/QueryCode/queryCode.js
index b4da6c8f4..9598fe358 100644
--- a/js/src/modals/SMSVerification/QueryCode/queryCode.js
+++ b/js/src/modals/SMSVerification/QueryCode/queryCode.js
@@ -45,6 +45,7 @@ export default class QueryCode extends Component {
   onChange = (_, code) => {
     this.props.setCode(code.trim());
   }
+
   onSubmit = (code) => {
     this.props.setCode(code.trim());
   }
diff --git a/js/src/modals/SMSVerification/SMSVerification.js b/js/src/modals/SMSVerification/SMSVerification.js
index 3575fc76a..47124e7f6 100644
--- a/js/src/modals/SMSVerification/SMSVerification.js
+++ b/js/src/modals/SMSVerification/SMSVerification.js
@@ -83,7 +83,9 @@ export default class SMSVerification extends Component {
         onClick={ onClose }
       />
     );
-    if (error) return (<div>{ cancel }</div>);
+    if (error) {
+      return (<div>{ cancel }</div>);
+    }
 
     if (phase === 4) {
       return (
@@ -100,14 +102,19 @@ export default class SMSVerification extends Component {
     }
 
     let action;
-    if (phase === 3) {
-      action = store.done;
-    } else if (phase === 2) {
-      action = store.sendConfirmation;
-    } else if (phase === 1) {
-      action = store.queryCode;
-    } else if (phase === 0) {
-      action = store.sendRequest;
+    switch (phase) {
+      case 0:
+        action = store.sendRequest;
+        break;
+      case 1:
+        action = store.queryCode;
+        break;
+      case 2:
+        action = store.sendConfirmation;
+        break;
+      case 3:
+        action = store.done;
+        break;
     }
 
     return (
@@ -124,7 +131,9 @@ export default class SMSVerification extends Component {
   }
 
   renderStep (phase, error) {
-    if (error) return (<p>{ error }</p>);
+    if (error) {
+      return (<p>{ error }</p>);
+    }
 
     const {
       step,
diff --git a/js/src/modals/SMSVerification/SendRequest/sendRequest.js b/js/src/modals/SMSVerification/SendRequest/sendRequest.js
index 91c857a6a..31190f628 100644
--- a/js/src/modals/SMSVerification/SendRequest/sendRequest.js
+++ b/js/src/modals/SMSVerification/SendRequest/sendRequest.js
@@ -35,23 +35,25 @@ export default class SendRequest extends Component {
   render () {
     const { step, tx } = this.props;
 
-    if (step === POSTING_REQUEST) {
-      return (<p>A verification request will be sent to the contract. Please authorize this using the Parity Signer.</p>);
-    }
+    switch (step) {
+      case POSTING_REQUEST:
+        return (<p>A verification request will be sent to the contract. Please authorize this using the Parity Signer.</p>);
 
-    if (step === POSTED_REQUEST) {
-      return (
-        <div className={ styles.centered }>
-          <TxHash hash={ tx } maxConfirmations={ 1 } />
-          <p>Please keep this window open.</p>
-        </div>
-      );
-    }
+      case POSTED_REQUEST:
+        return (
+          <div className={ styles.centered }>
+            <TxHash hash={ tx } maxConfirmations={ 1 } />
+            <p>Please keep this window open.</p>
+          </div>
+        );
 
-    if (step === REQUESTING_SMS) {
-      return (<p>Requesting an SMS from the Parity server.</p>);
-    }
+      case REQUESTING_SMS:
+        return (
+          <p>Requesting an SMS from the Parity server.</p>
+        );
 
-    return null;
+      default:
+        return null;
+    }
   }
 }
diff --git a/js/src/modals/SMSVerification/store.js b/js/src/modals/SMSVerification/store.js
index d8a1247e5..1a6a58011 100644
--- a/js/src/modals/SMSVerification/store.js
+++ b/js/src/modals/SMSVerification/store.js
@@ -69,29 +69,18 @@ export default class VerificationStore {
       return false;
     }
 
-    if (this.step === GATHERED_DATA) {
-      return this.fee && this.isVerified === false && this.isNumberValid && this.consentGiven;
+    switch (this.step) {
+      case GATHERED_DATA:
+        return this.fee && this.isVerified === false && this.isNumberValid && this.consentGiven;
+      case REQUESTED_SMS:
+        return this.requestTx;
+      case QUERY_CODE:
+        return this.isCodeValid;
+      case POSTED_CONFIRMATION:
+        return this.confirmationTx;
+      default:
+        return false;
     }
-    if (this.step === REQUESTED_SMS) {
-      return this.requestTx;
-    }
-    if (this.step === QUERY_CODE) {
-      return this.isCodeValid;
-    }
-    if (this.step === POSTED_CONFIRMATION) {
-      return this.confirmationTx;
-    }
-    return false;
-  }
-
-  @action setNumber = (number) => {
-    this.number = number;
-  }
-  @action setConsentGiven = (consentGiven) => {
-    this.consentGiven = consentGiven;
-  }
-  @action setCode = (code) => {
-    this.code = code;
   }
 
   constructor (api, account) {
@@ -106,6 +95,18 @@ export default class VerificationStore {
     });
   }
 
+  @action setNumber = (number) => {
+    this.number = number;
+  }
+
+  @action setConsentGiven = (consentGiven) => {
+    this.consentGiven = consentGiven;
+  }
+
+  @action setCode = (code) => {
+    this.code = code;
+  }
+
   @action gatherData = () => {
     const { contract, account } = this;
     this.step = GATHERING_DATA;
@@ -137,10 +138,11 @@ export default class VerificationStore {
         this.error = 'Failed to check if requested: ' + err.message;
       });
 
-    Promise.all([ fee, isVerified, hasRequested ])
-    .then(() => {
-      this.step = GATHERED_DATA;
-    });
+    Promise
+      .all([ fee, isVerified, hasRequested ])
+      .then(() => {
+        this.step = GATHERED_DATA;
+      });
   }
 
   @action sendRequest = () => {
@@ -165,13 +167,13 @@ export default class VerificationStore {
         .then((txHash) => {
           this.requestTx = txHash;
           return checkIfTxFailed(api, txHash, options.gas)
-          .then((hasFailed) => {
-            if (hasFailed) {
-              throw new Error('Transaction failed, all gas used up.');
-            }
-            this.step = POSTED_REQUEST;
-            return waitForConfirmations(api, txHash, 1);
-          });
+            .then((hasFailed) => {
+              if (hasFailed) {
+                throw new Error('Transaction failed, all gas used up.');
+              }
+              this.step = POSTED_REQUEST;
+              return waitForConfirmations(api, txHash, 1);
+            });
         });
     }
 
@@ -214,13 +216,13 @@ export default class VerificationStore {
       .then((txHash) => {
         this.confirmationTx = txHash;
         return checkIfTxFailed(api, txHash, options.gas)
-        .then((hasFailed) => {
-          if (hasFailed) {
-            throw new Error('Transaction failed, all gas used up.');
-          }
-          this.step = POSTED_CONFIRMATION;
-          return waitForConfirmations(api, txHash, 1);
-        });
+          .then((hasFailed) => {
+            if (hasFailed) {
+              throw new Error('Transaction failed, all gas used up.');
+            }
+            this.step = POSTED_CONFIRMATION;
+            return waitForConfirmations(api, txHash, 1);
+          });
       })
       .then(() => {
         this.step = DONE;
diff --git a/js/src/ui/TxHash/txHash.js b/js/src/ui/TxHash/txHash.js
index 87d1850f7..83e5c79f5 100644
--- a/js/src/ui/TxHash/txHash.js
+++ b/js/src/ui/TxHash/txHash.js
@@ -102,7 +102,9 @@ class TxHash extends Component {
       <div className={ styles.confirm }>
         <LinearProgress
           className={ styles.progressbar }
-          min={ 0 } max={ maxConfirmations } value={ value }
+          min={ 0 }
+          max={ maxConfirmations }
+          value={ value }
           color='white'
           mode='determinate' />
         <div className={ styles.progressinfo }>

From d890dd6f42250987e272c9541eed55b47d54dac9 Mon Sep 17 00:00:00 2001
From: arkpar <arkady.paronyan@gmail.com>
Date: Thu, 17 Nov 2016 13:01:50 +0100
Subject: [PATCH 44/57] Updated sync algo desription

---
 sync/src/chain.rs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/sync/src/chain.rs b/sync/src/chain.rs
index d780eb446..d2939fbac 100644
--- a/sync/src/chain.rs
+++ b/sync/src/chain.rs
@@ -37,7 +37,7 @@
 /// Workflow for `ChainHead` state.
 /// In this state we try to get subchain headers with a single `GetBlockHeaders` request.
 /// On `NewPeer` / On `Restart`:
-/// 	If peer's total difficulty is higher, request N/M headers with interval M+1 starting from l
+/// 	If peer's total difficulty is higher and there are less than 5 peers downloading, request N/M headers with interval M+1 starting from l
 /// On `BlockHeaders(R)`:
 /// 	If R is empty:
 /// If l is equal to genesis block hash or l is more than 1000 blocks behind our best hash:
@@ -49,8 +49,8 @@
 /// Else
 /// 	Set S to R, set s to `Blocks`.
 ///
-///
 /// All other messages are ignored.
+///
 /// Workflow for `Blocks` state.
 /// In this state we download block headers and bodies from multiple peers.
 /// On `NewPeer` / On `Restart`:
@@ -62,7 +62,9 @@
 ///
 /// On `BlockHeaders(R)`:
 /// If R is empty remove current peer from P and restart.
-/// 	Validate received headers. For each header find a parent in H or R or the blockchain. Restart if there is a block with unknown parent.
+/// 	Validate received headers:
+/// 		For each header find a parent in H or R or the blockchain. Restart if there is a block with unknown parent.
+/// 		Find at least one header from the received list in S. Restart if there is none.
 /// Go to `CollectBlocks`.
 ///
 /// On `BlockBodies(R)`:

From 3f0053f884248b00eb123d70941f256dacb58dee Mon Sep 17 00:00:00 2001
From: Jannis R <mail@jannisr.de>
Date: Thu, 17 Nov 2016 12:57:30 +0100
Subject: [PATCH 45/57] sms verification: move helper functions

- checkIfTxFailed & waitForBlockConfirmations are both general-purpose
- checkIfVerified, checkIfRequested & postToServer are sms verification-specific
---
 js/src/contracts/contracts.js                 |  5 +++
 .../sms-verification.js}                      | 23 +++++++++++--
 .../SMSVerification/check-if-verified.js      | 21 ------------
 .../post-to-verification-server.js            | 34 -------------------
 js/src/modals/SMSVerification/store.js        | 10 +++---
 .../check-if-tx-failed.js                     |  0
 .../wait-for-block-confirmations.js}          |  0
 7 files changed, 30 insertions(+), 63 deletions(-)
 rename js/src/{modals/SMSVerification/check-if-requested.js => contracts/sms-verification.js} (64%)
 delete mode 100644 js/src/modals/SMSVerification/check-if-verified.js
 delete mode 100644 js/src/modals/SMSVerification/post-to-verification-server.js
 rename js/src/{modals/SMSVerification => util}/check-if-tx-failed.js (100%)
 rename js/src/{modals/SMSVerification/wait-for-confirmations.js => util/wait-for-block-confirmations.js} (100%)

diff --git a/js/src/contracts/contracts.js b/js/src/contracts/contracts.js
index a04321c7b..9d745762c 100644
--- a/js/src/contracts/contracts.js
+++ b/js/src/contracts/contracts.js
@@ -19,6 +19,7 @@ import Registry from './registry';
 import SignatureReg from './signaturereg';
 import TokenReg from './tokenreg';
 import GithubHint from './githubhint';
+import smsVerification from './sms-verification';
 
 let instance = null;
 
@@ -54,6 +55,10 @@ export default class Contracts {
     return this._githubhint;
   }
 
+  get smsVerification () {
+    return smsVerification;
+  }
+
   static create (api) {
     return new Contracts(api);
   }
diff --git a/js/src/modals/SMSVerification/check-if-requested.js b/js/src/contracts/sms-verification.js
similarity index 64%
rename from js/src/modals/SMSVerification/check-if-requested.js
rename to js/src/contracts/sms-verification.js
index 608022541..e93d57ffc 100644
--- a/js/src/modals/SMSVerification/check-if-requested.js
+++ b/js/src/contracts/sms-verification.js
@@ -14,7 +14,13 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-const checkIfRequested = (contract, account) => {
+import { stringify } from 'querystring';
+
+export const checkIfVerified = (contract, account) => {
+  return contract.instance.certified.call({}, [account]);
+};
+
+export const checkIfRequested = (contract, account) => {
   return new Promise((resolve, reject) => {
     contract.subscribe('Requested', {
       fromBlock: 0, toBlock: 'pending'
@@ -30,4 +36,17 @@ const checkIfRequested = (contract, account) => {
   });
 };
 
-export default checkIfRequested;
+export const postToServer = (query) => {
+  query = stringify(query);
+  return fetch('https://sms-verification.parity.io/?' + query, {
+    method: 'POST', mode: 'cors', cache: 'no-store'
+  })
+  .then((res) => {
+    return res.json().then((data) => {
+      if (res.ok) {
+        return data.message;
+      }
+      throw new Error(data.message || 'unknown error');
+    });
+  });
+};
diff --git a/js/src/modals/SMSVerification/check-if-verified.js b/js/src/modals/SMSVerification/check-if-verified.js
deleted file mode 100644
index f45b0caba..000000000
--- a/js/src/modals/SMSVerification/check-if-verified.js
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-const checkIfVerified = (contract, account) => {
-  return contract.instance.certified.call({}, [account]);
-};
-
-export default checkIfVerified;
diff --git a/js/src/modals/SMSVerification/post-to-verification-server.js b/js/src/modals/SMSVerification/post-to-verification-server.js
deleted file mode 100644
index b7889f3e0..000000000
--- a/js/src/modals/SMSVerification/post-to-verification-server.js
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { stringify } from 'querystring';
-
-const postToVerificationServer = (query) => {
-  query = stringify(query);
-  return fetch('https://sms-verification.parity.io/?' + query, {
-    method: 'POST', mode: 'cors', cache: 'no-store'
-  })
-  .then((res) => {
-    return res.json().then((data) => {
-      if (res.ok) {
-        return data.message;
-      }
-      throw new Error(data.message || 'unknown error');
-    });
-  });
-};
-
-export default postToVerificationServer;
diff --git a/js/src/modals/SMSVerification/store.js b/js/src/modals/SMSVerification/store.js
index 1a6a58011..0682369c1 100644
--- a/js/src/modals/SMSVerification/store.js
+++ b/js/src/modals/SMSVerification/store.js
@@ -22,11 +22,9 @@ import ABI from '../../contracts/abi/sms-verification.json';
 // TODO: move this to a better place
 const contract = '0xcE381B876A85A72303f7cA7b3a012f58F4CEEEeB';
 
-import checkIfVerified from './check-if-verified';
-import checkIfRequested from './check-if-requested';
-import checkIfTxFailed from './check-if-tx-failed';
-import waitForConfirmations from './wait-for-confirmations';
-import postToVerificationServer from './post-to-verification-server';
+import { checkIfVerified, checkIfRequested, postToServer } from '../../contracts/sms-verification';
+import checkIfTxFailed from '../../util/check-if-tx-failed';
+import waitForConfirmations from '../../util/wait-for-block-confirmations';
 
 const validCode = /^[A-Z\s]+$/i;
 
@@ -180,7 +178,7 @@ export default class VerificationStore {
     chain
       .then(() => {
         this.step = REQUESTING_SMS;
-        return postToVerificationServer({ number, address: account });
+        return postToServer({ number, address: account });
       })
       .then(() => {
         this.step = REQUESTED_SMS;
diff --git a/js/src/modals/SMSVerification/check-if-tx-failed.js b/js/src/util/check-if-tx-failed.js
similarity index 100%
rename from js/src/modals/SMSVerification/check-if-tx-failed.js
rename to js/src/util/check-if-tx-failed.js
diff --git a/js/src/modals/SMSVerification/wait-for-confirmations.js b/js/src/util/wait-for-block-confirmations.js
similarity index 100%
rename from js/src/modals/SMSVerification/wait-for-confirmations.js
rename to js/src/util/wait-for-block-confirmations.js

From 9bbaa03932322a66b4a1b808947203186e71cbed Mon Sep 17 00:00:00 2001
From: NikVolf <nikvolf@gmail.com>
Date: Thu, 17 Nov 2016 15:03:12 +0300
Subject: [PATCH 46/57] check for sanity

---
 ethcrypto/src/lib.rs                 | 43 ++++++++++++++++++++++++++--
 ethstore/src/account/safe_account.rs |  2 +-
 2 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/ethcrypto/src/lib.rs b/ethcrypto/src/lib.rs
index 103e750e6..c98d14027 100644
--- a/ethcrypto/src/lib.rs
+++ b/ethcrypto/src/lib.rs
@@ -34,16 +34,43 @@ pub const KEY_LENGTH: usize = 32;
 pub const KEY_ITERATIONS: usize = 10240;
 pub const KEY_LENGTH_AES: usize = KEY_LENGTH / 2;
 
+#[derive(PartialEq, Debug)]
+pub enum ScryptError {
+	// log(N) < r / 16
+	InvalidN,
+	// p <= (2^31-1 * 32)/(128 * r)
+	InvalidP,
+}
+
+impl fmt::Display for ScryptError {
+	fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
+		let s = match *self {
+			ScryptError::InvalidN => "Invalid N argument of the scrypt encryption" ,
+			ScryptError::InvalidP => "Invalid p argument of the scrypt encryption",
+		};
+
+		write!(f, "{}", s)
+	}
+}
+
 #[derive(PartialEq, Debug)]
 pub enum Error {
 	Secp(SecpError),
+	Scrypt(ScryptError),
 	InvalidMessage,
 }
 
+impl From<ScryptError> for Error {
+	fn from(err: ScryptError) -> Self {
+		Error::Scrypt(err)
+	}
+}
+
 impl fmt::Display for Error {
 	fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
 		let s = match *self {
 			Error::Secp(ref err) => err.to_string(),
+			Error::Scrypt(ref err) => err.to_string(),
 			Error::InvalidMessage => "Invalid message".into(),
 		};
 
@@ -80,13 +107,23 @@ pub fn derive_key_iterations(password: &str, salt: &[u8; 32], c: u32) -> (Vec<u8
 	(derived_right_bits.to_vec(), derived_left_bits.to_vec())
 }
 
-pub fn derive_key_scrypt(password: &str, salt: &[u8; 32], n: u32, p: u32, r: u32) -> (Vec<u8>, Vec<u8>) {
+pub fn derive_key_scrypt(password: &str, salt: &[u8; 32], n: u32, p: u32, r: u32) -> Result<(Vec<u8>, Vec<u8>), Error> {
+	// sanity checks
+	let log_n = (32 - n.leading_zeros() - 1) as u8;
+	if log_n as u32 >= r * 16 {
+		return Err(Error::Scrypt(ScryptError::InvalidN));
+	}
+
+	if p as u64 > ((u32::max_value() as u64 - 1) * 32)/(128 * (r as u64)) {
+		return Err(Error::Scrypt(ScryptError::InvalidP));
+	}
+
 	let mut derived_key = vec![0u8; KEY_LENGTH];
-	let scrypt_params = ScryptParams::new(n.trailing_zeros() as u8, r, p);
+	let scrypt_params = ScryptParams::new(log_n, r, p);
 	scrypt(password.as_bytes(), salt, &scrypt_params, &mut derived_key);
 	let derived_right_bits = &derived_key[0..KEY_LENGTH_AES];
 	let derived_left_bits = &derived_key[KEY_LENGTH_AES..KEY_LENGTH];
-	(derived_right_bits.to_vec(), derived_left_bits.to_vec())
+	Ok((derived_right_bits.to_vec(), derived_left_bits.to_vec()))
 }
 
 pub fn derive_mac(derived_left_bits: &[u8], cipher_text: &[u8]) -> Vec<u8> {
diff --git a/ethstore/src/account/safe_account.rs b/ethstore/src/account/safe_account.rs
index 5dab35251..336e72875 100644
--- a/ethstore/src/account/safe_account.rs
+++ b/ethstore/src/account/safe_account.rs
@@ -113,7 +113,7 @@ impl Crypto {
 
 		let (derived_left_bits, derived_right_bits) = match self.kdf {
 			Kdf::Pbkdf2(ref params) => crypto::derive_key_iterations(password, &params.salt, params.c),
-			Kdf::Scrypt(ref params) => crypto::derive_key_scrypt(password, &params.salt, params.n, params.p, params.r),
+			Kdf::Scrypt(ref params) => try!(crypto::derive_key_scrypt(password, &params.salt, params.n, params.p, params.r)),
 		};
 
 		let mac = crypto::derive_mac(&derived_right_bits, &self.ciphertext).keccak256();

From 139e66932d38808bd0115ac0416979189dcf1b89 Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jaco@ethcore.io>
Date: Thu, 17 Nov 2016 14:05:11 +0100
Subject: [PATCH 47/57] Add trace_{call, rawTransaction, replayTransaction}

---
 js/src/api/format/input.js         |  8 +++
 js/src/api/format/input.spec.js    | 14 ++++-
 js/src/api/format/output.js        | 22 ++++++++
 js/src/api/rpc/trace/trace.e2e.js  | 24 +++++---
 js/src/api/rpc/trace/trace.js      | 40 ++++++++++----
 js/src/jsonrpc/interfaces/trace.js | 88 +++++++++++++++++++++++++-----
 6 files changed, 162 insertions(+), 34 deletions(-)

diff --git a/js/src/api/format/input.js b/js/src/api/format/input.js
index 830ca0e21..4cd1c8a56 100644
--- a/js/src/api/format/input.js
+++ b/js/src/api/format/input.js
@@ -166,3 +166,11 @@ export function inTraceFilter (filterObject) {
 
   return filterObject;
 }
+
+export function inTraceType (whatTrace) {
+  if (isString(whatTrace)) {
+    return [whatTrace];
+  }
+
+  return whatTrace;
+}
diff --git a/js/src/api/format/input.spec.js b/js/src/api/format/input.spec.js
index 219886d05..a22c8d131 100644
--- a/js/src/api/format/input.spec.js
+++ b/js/src/api/format/input.spec.js
@@ -16,7 +16,7 @@
 
 import BigNumber from 'bignumber.js';
 
-import { inAddress, inBlockNumber, inData, inFilter, inHex, inNumber10, inNumber16, inOptions } from './input';
+import { inAddress, inBlockNumber, inData, inFilter, inHex, inNumber10, inNumber16, inOptions, inTraceType } from './input';
 import { isAddress } from '../../../test/types';
 
 describe('api/format/input', () => {
@@ -242,4 +242,16 @@ describe('api/format/input', () => {
       });
     });
   });
+
+  describe('inTraceType', () => {
+    it('returns array of types as is', () => {
+      const types = ['vmTrace', 'trace', 'stateDiff'];
+      expect(inTraceType(types)).to.deep.equal(types);
+    });
+
+    it('formats single string type into array', () => {
+      const type = 'vmTrace';
+      expect(inTraceType(type)).to.deep.equal([type]);
+    });
+  });
 });
diff --git a/js/src/api/format/output.js b/js/src/api/format/output.js
index 8461df20f..262a275a0 100644
--- a/js/src/api/format/output.js
+++ b/js/src/api/format/output.js
@@ -254,3 +254,25 @@ export function outTrace (trace) {
 
   return trace;
 }
+
+export function outTraces (traces) {
+  if (traces) {
+    return traces.map(outTrace);
+  }
+
+  return traces;
+}
+
+export function outTraceReplay (trace) {
+  if (trace) {
+    Object.keys(trace).forEach((key) => {
+      switch (key) {
+        case 'trace':
+          trace[key] = outTraces(trace[key]);
+          break;
+      }
+    });
+  }
+
+  return trace;
+}
diff --git a/js/src/api/rpc/trace/trace.e2e.js b/js/src/api/rpc/trace/trace.e2e.js
index 1a0720927..8da243cd9 100644
--- a/js/src/api/rpc/trace/trace.e2e.js
+++ b/js/src/api/rpc/trace/trace.e2e.js
@@ -16,19 +16,29 @@
 
 import { createHttpApi } from '../../../../test/e2e/ethapi';
 
-describe('ethapi.trace', () => {
+describe.only('ethapi.trace', () => {
   const ethapi = createHttpApi();
 
   describe('block', () => {
-    it('returns the latest block', () => {
-      return ethapi.trace.block().then((block) => {
-        expect(block).to.be.ok;
+    it('returns the latest block traces', () => {
+      return ethapi.trace.block().then((traces) => {
+        expect(traces).to.be.ok;
       });
     });
 
-    it('returns a specified block', () => {
-      return ethapi.trace.block('0x65432').then((block) => {
-        expect(block).to.be.ok;
+    it('returns traces for a specified block', () => {
+      return ethapi.trace.block('0x65432').then((traces) => {
+        expect(traces).to.be.ok;
+      });
+    });
+  });
+
+  describe('replayTransaction', () => {
+    it('returns traces for a specific transaction', () => {
+      return ethapi.eth.getBlockByNumber().then((latestBlock) => {
+        return ethapi.trace.replayTransaction(latestBlock.transactions[0]).then((traces) => {
+          expect(traces).to.be.ok;
+        });
       });
     });
   });
diff --git a/js/src/api/rpc/trace/trace.js b/js/src/api/rpc/trace/trace.js
index 95fed4230..5c693c0b5 100644
--- a/js/src/api/rpc/trace/trace.js
+++ b/js/src/api/rpc/trace/trace.js
@@ -14,35 +14,53 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-import { inBlockNumber, inHex, inNumber16, inTraceFilter } from '../../format/input';
-import { outTrace } from '../../format/output';
+import { inBlockNumber, inData, inHex, inNumber16, inOptions, inTraceFilter, inTraceType } from '../../format/input';
+import { outTraces, outTraceReplay } from '../../format/output';
 
 export default class Trace {
   constructor (transport) {
     this._transport = transport;
   }
 
+  block (blockNumber = 'latest') {
+    return this._transport
+      .execute('trace_block', inBlockNumber(blockNumber))
+      .then(outTraces);
+  }
+
+  call (options, blockNumber = 'latest', whatTrace = ['trace']) {
+    return this._transport
+      .execute('trace_call', inOptions(options), inBlockNumber(blockNumber), inTraceType(whatTrace))
+      .then(outTraceReplay);
+  }
+
   filter (filterObj) {
     return this._transport
       .execute('trace_filter', inTraceFilter(filterObj))
-      .then(traces => traces.map(trace => outTrace(trace)));
+      .then(outTraces);
   }
 
   get (txHash, position) {
     return this._transport
       .execute('trace_get', inHex(txHash), inNumber16(position))
-      .then(trace => outTrace(trace));
+      .then(outTraces);
+  }
+
+  rawTransaction (data, whatTrace = ['trace']) {
+    return this._transport
+      .execute('trace_rawTransaction', inData(data), inTraceType(whatTrace))
+      .then(outTraceReplay);
+  }
+
+  replayTransaction (txHash, whatTrace = ['trace']) {
+    return this._transport
+      .execute('trace_replayTransaction', txHash, inTraceType(whatTrace))
+      .then(outTraceReplay);
   }
 
   transaction (txHash) {
     return this._transport
       .execute('trace_transaction', inHex(txHash))
-      .then(traces => traces.map(trace => outTrace(trace)));
-  }
-
-  block (blockNumber = 'latest') {
-    return this._transport
-      .execute('trace_block', inBlockNumber(blockNumber))
-      .then(traces => traces.map(trace => outTrace(trace)));
+      .then(outTraces);
   }
 }
diff --git a/js/src/jsonrpc/interfaces/trace.js b/js/src/jsonrpc/interfaces/trace.js
index 3dc4451f0..efe45f34e 100644
--- a/js/src/jsonrpc/interfaces/trace.js
+++ b/js/src/jsonrpc/interfaces/trace.js
@@ -14,9 +14,45 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-import { BlockNumber, Hash, Integer } from '../types';
+import { BlockNumber, Data, Hash, Integer } from '../types';
 
 export default {
+  block: {
+    desc: 'Returns traces created at given block',
+    params: [
+      {
+        type: BlockNumber,
+        desc: 'Integer block number, or \'latest\' for the last mined block or \'pending\', \'earliest\' for not yet mined transactions'
+      }
+    ],
+    returns: {
+      type: Array,
+      desc: 'Block traces'
+    }
+  },
+
+  call: {
+    desc: 'Returns traces for a specific call',
+    params: [
+      {
+        type: Object,
+        desc: 'Call options'
+      },
+      {
+        type: BlockNumber,
+        desc: 'The blockNumber'
+      },
+      {
+        type: Array,
+        desc: 'Type of trace, one or more of \'vmTrace\', \'trace\' and/or \'stateDiff\''
+      }
+    ],
+    returns: {
+      type: Array,
+      desc: 'Block traces'
+    }
+  },
+
   filter: {
     desc: 'Returns traces matching given filter',
     params: [
@@ -49,6 +85,42 @@ export default {
     }
   },
 
+  rawTransaction: {
+    desc: 'Traces a call to eth_sendRawTransaction without making the call, returning the traces',
+    params: [
+      {
+        type: Data,
+        desc: 'Transaction data'
+      },
+      {
+        type: Array,
+        desc: 'Type of trace, one or more of \'vmTrace\', \'trace\' and/or \'stateDiff\''
+      }
+    ],
+    returns: {
+      type: Array,
+      desc: 'Block traces'
+    }
+  },
+
+  replayTransaction: {
+    desc: 'Replays a transaction, returning the traces',
+    params: [
+      {
+        type: Hash,
+        desc: 'Transaction hash'
+      },
+      {
+        type: Array,
+        desc: 'Type of trace, one or more of \'vmTrace\', \'trace\' and/or \'stateDiff\''
+      }
+    ],
+    returns: {
+      type: Array,
+      desc: 'Block traces'
+    }
+  },
+
   transaction: {
     desc: 'Returns all traces of given transaction',
     params: [
@@ -61,19 +133,5 @@ export default {
       type: Array,
       desc: 'Traces of given transaction'
     }
-  },
-
-  block: {
-    desc: 'Returns traces created at given block',
-    params: [
-      {
-        type: BlockNumber,
-        desc: 'Integer block number, or \'latest\' for the last mined block or \'pending\', \'earliest\' for not yet mined transactions'
-      }
-    ],
-    returns: {
-      type: Array,
-      desc: 'Block traces'
-    }
   }
 };

From 1b5f7f2241110f2481713ba52f5c0aa5c0dade9d Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jaco@ethcore.io>
Date: Thu, 17 Nov 2016 14:07:34 +0100
Subject: [PATCH 48/57] Remove dangling only

---
 js/src/api/rpc/trace/trace.e2e.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/src/api/rpc/trace/trace.e2e.js b/js/src/api/rpc/trace/trace.e2e.js
index 8da243cd9..88c0988f6 100644
--- a/js/src/api/rpc/trace/trace.e2e.js
+++ b/js/src/api/rpc/trace/trace.e2e.js
@@ -16,7 +16,7 @@
 
 import { createHttpApi } from '../../../../test/e2e/ethapi';
 
-describe.only('ethapi.trace', () => {
+describe('ethapi.trace', () => {
   const ethapi = createHttpApi();
 
   describe('block', () => {

From fff8743ee6d5a1e779793206246263a63d45cfdb Mon Sep 17 00:00:00 2001
From: Jannis R <mail@jannisr.de>
Date: Thu, 17 Nov 2016 14:21:05 +0100
Subject: [PATCH 49/57] sms verification: fetch contract address from Registry

---
 js/src/contracts/abi/index.js          |  4 +-
 js/src/modals/SMSVerification/store.js | 56 +++++++++++++++-----------
 2 files changed, 35 insertions(+), 25 deletions(-)

diff --git a/js/src/contracts/abi/index.js b/js/src/contracts/abi/index.js
index dda43775e..a6a7f0783 100644
--- a/js/src/contracts/abi/index.js
+++ b/js/src/contracts/abi/index.js
@@ -23,7 +23,7 @@ import githubhint from './githubhint.json';
 import owned from './owned.json';
 import registry from './registry.json';
 import signaturereg from './signaturereg.json';
-import smsVerification from './sms-verification.json';
+import smsverification from './sms-verification.json';
 import tokenreg from './tokenreg.json';
 import wallet from './wallet.json';
 
@@ -37,7 +37,7 @@ export {
   owned,
   registry,
   signaturereg,
-  smsVerification,
+  smsverification,
   tokenreg,
   wallet
 };
diff --git a/js/src/modals/SMSVerification/store.js b/js/src/modals/SMSVerification/store.js
index 0682369c1..7337f4eac 100644
--- a/js/src/modals/SMSVerification/store.js
+++ b/js/src/modals/SMSVerification/store.js
@@ -18,9 +18,7 @@ import { observable, computed, autorun, action } from 'mobx';
 import phone from 'phoneformat.js';
 import { sha3 } from '../../api/util/sha3';
 
-import ABI from '../../contracts/abi/sms-verification.json';
-// TODO: move this to a better place
-const contract = '0xcE381B876A85A72303f7cA7b3a012f58F4CEEEeB';
+import Contracts from '../../contracts';
 
 import { checkIfVerified, checkIfRequested, postToServer } from '../../contracts/sms-verification';
 import checkIfTxFailed from '../../util/check-if-tx-failed';
@@ -28,8 +26,8 @@ import waitForConfirmations from '../../util/wait-for-block-confirmations';
 
 const validCode = /^[A-Z\s]+$/i;
 
-export const GATHERING_DATA = 'gathering-data';
-export const GATHERED_DATA = 'gathered-data';
+export const LOADING = 'fetching-contract';
+export const QUERY_DATA = 'query-data';
 export const POSTING_REQUEST = 'posting-request';
 export const POSTED_REQUEST = 'posted-request';
 export const REQUESTING_SMS = 'requesting-sms';
@@ -43,6 +41,7 @@ export default class VerificationStore {
   @observable step = null;
   @observable error = null;
 
+  @observable contract = null;
   @observable fee = null;
   @observable isVerified = null;
   @observable hasRequested = null;
@@ -68,8 +67,10 @@ export default class VerificationStore {
     }
 
     switch (this.step) {
-      case GATHERED_DATA:
-        return this.fee && this.isVerified === false && this.isNumberValid && this.consentGiven;
+      case LOADING:
+        return this.contract && this.fee && this.isVerified !== null && this.hasRequested !== null;
+      case QUERY_DATA:
+        return this.isNumberValid && this.consentGiven;
       case REQUESTED_SMS:
         return this.requestTx;
       case QUERY_CODE:
@@ -84,7 +85,16 @@ export default class VerificationStore {
   constructor (api, account) {
     this.api = api;
     this.account = account;
-    this.contract = api.newContract(ABI, contract);
+
+    this.step = LOADING;
+    Contracts.create(api).registry.getContract('smsVerification')
+      .then((contract) => {
+        this.contract = contract;
+        this.load();
+      })
+      .catch((err) => {
+        this.error = 'Failed to fetch the contract: ' + err.message;
+      });
 
     autorun(() => {
       if (this.error) {
@@ -93,21 +103,9 @@ export default class VerificationStore {
     });
   }
 
-  @action setNumber = (number) => {
-    this.number = number;
-  }
-
-  @action setConsentGiven = (consentGiven) => {
-    this.consentGiven = consentGiven;
-  }
-
-  @action setCode = (code) => {
-    this.code = code;
-  }
-
-  @action gatherData = () => {
+  @action load = () => {
     const { contract, account } = this;
-    this.step = GATHERING_DATA;
+    this.step = LOADING;
 
     const fee = contract.instance.fee.call()
       .then((fee) => {
@@ -139,10 +137,22 @@ export default class VerificationStore {
     Promise
       .all([ fee, isVerified, hasRequested ])
       .then(() => {
-        this.step = GATHERED_DATA;
+        this.step = QUERY_DATA;
       });
   }
 
+  @action setNumber = (number) => {
+    this.number = number;
+  }
+
+  @action setConsentGiven = (consentGiven) => {
+    this.consentGiven = consentGiven;
+  }
+
+  @action setCode = (code) => {
+    this.code = code;
+  }
+
   @action sendRequest = () => {
     const { api, account, contract, fee, number, hasRequested } = this;
 

From 179078d31a225fc5bdf68664c0f047be3911980b Mon Sep 17 00:00:00 2001
From: Jannis R <mail@jannisr.de>
Date: Thu, 17 Nov 2016 14:21:44 +0100
Subject: [PATCH 50/57] sms verification: loading step

---
 .../modals/SMSVerification/SMSVerification.js | 47 ++++++++++---------
 1 file changed, 24 insertions(+), 23 deletions(-)

diff --git a/js/src/modals/SMSVerification/SMSVerification.js b/js/src/modals/SMSVerification/SMSVerification.js
index 47124e7f6..4ec0b608d 100644
--- a/js/src/modals/SMSVerification/SMSVerification.js
+++ b/js/src/modals/SMSVerification/SMSVerification.js
@@ -22,7 +22,8 @@ import ContentClear from 'material-ui/svg-icons/content/clear';
 import { Button, IdentityIcon, Modal } from '../../ui';
 
 import {
-  GATHERING_DATA, GATHERED_DATA,
+  LOADING,
+  QUERY_DATA,
   POSTING_REQUEST, POSTED_REQUEST,
   REQUESTING_SMS, REQUESTED_SMS,
   POSTING_CONFIRMATION, POSTED_CONFIRMATION,
@@ -44,15 +45,12 @@ export default class SMSVerification extends Component {
   }
 
   static phases = { // mapping (store steps -> steps)
-    [GATHERING_DATA]: 0, [GATHERED_DATA]: 0,
-    [POSTING_REQUEST]: 1, [POSTED_REQUEST]: 1, [REQUESTING_SMS]: 1,
-    [REQUESTED_SMS]: 2,
-    [POSTING_CONFIRMATION]: 3, [POSTED_CONFIRMATION]: 3,
-    [DONE]: 4
-  }
-
-  componentDidMount () {
-    this.props.store.gatherData();
+    [LOADING]: 0,
+    [QUERY_DATA]: 1,
+    [POSTING_REQUEST]: 2, [POSTED_REQUEST]: 2, [REQUESTING_SMS]: 2,
+    [REQUESTED_SMS]: 3,
+    [POSTING_CONFIRMATION]: 4, [POSTED_CONFIRMATION]: 4,
+    [DONE]: 5
   }
 
   render () {
@@ -65,8 +63,8 @@ export default class SMSVerification extends Component {
         title='verify your account via SMS'
         visible scroll
         current={ phase }
-        steps={ ['Enter Data', 'Request', 'Enter Code', 'Confirm', 'Done!'] }
-        waiting={ error ? [] : [ 1, 3 ] }
+        steps={ ['Prepare', 'Enter Data', 'Request', 'Enter Code', 'Confirm', 'Done!'] }
+        waiting={ error ? [] : [ 0, 2, 4 ] }
       >
         { this.renderStep(phase, error) }
       </Modal>
@@ -87,7 +85,7 @@ export default class SMSVerification extends Component {
       return (<div>{ cancel }</div>);
     }
 
-    if (phase === 4) {
+    if (phase === 5) {
       return (
         <div>
           { cancel }
@@ -101,18 +99,18 @@ export default class SMSVerification extends Component {
       );
     }
 
-    let action;
+    let action = () => {};
     switch (phase) {
-      case 0:
+      case 1:
         action = store.sendRequest;
         break;
-      case 1:
+      case 2:
         action = store.queryCode;
         break;
-      case 2:
+      case 3:
         action = store.sendConfirmation;
         break;
-      case 3:
+      case 4:
         action = store.done;
         break;
     }
@@ -142,13 +140,13 @@ export default class SMSVerification extends Component {
       setNumber, setConsentGiven, setCode
     } = this.props.store;
 
-    if (phase === 4) {
+    if (phase === 5) {
       return (<Done />);
     }
-    if (phase === 3) {
+    if (phase === 4) {
       return (<SendConfirmation step={ step } tx={ confirmationTx } />);
     }
-    if (phase === 2) {
+    if (phase === 3) {
       return (
         <QueryCode
           number={ number } fee={ fee } isCodeValid={ isCodeValid }
@@ -156,10 +154,10 @@ export default class SMSVerification extends Component {
         />
       );
     }
-    if (phase === 1) {
+    if (phase === 2) {
       return (<SendRequest step={ step } tx={ requestTx } />);
     }
-    if (phase === 0) {
+    if (phase === 1) {
       const { setNumber, setConsentGiven } = this.props.store;
       return (
         <GatherData
@@ -169,6 +167,9 @@ export default class SMSVerification extends Component {
         />
       );
     }
+    if (phase === 0) {
+      return (<p>Preparing awesomeness!</p>);
+    }
 
     return null;
   }

From 4ae58f7d331087f48da4b0a687a7d2e7e05fdac1 Mon Sep 17 00:00:00 2001
From: Jannis R <mail@jannisr.de>
Date: Thu, 17 Nov 2016 14:29:32 +0100
Subject: [PATCH 51/57] move nullable PropType helper

---
 .../SMSVerification/GatherData/gatherData.js  |  3 +--
 .../SendConfirmation/sendConfirmation.js      |  4 +---
 .../SendRequest/sendRequest.js                |  4 +---
 js/src/util/nullable-proptype.js              | 21 +++++++++++++++++++
 .../components/SignRequest/SignRequest.js     |  3 +--
 .../TransactionFinished.js                    |  3 +--
 6 files changed, 26 insertions(+), 12 deletions(-)
 create mode 100644 js/src/util/nullable-proptype.js

diff --git a/js/src/modals/SMSVerification/GatherData/gatherData.js b/js/src/modals/SMSVerification/GatherData/gatherData.js
index fa24e04e5..f4036a3bc 100644
--- a/js/src/modals/SMSVerification/GatherData/gatherData.js
+++ b/js/src/modals/SMSVerification/GatherData/gatherData.js
@@ -15,6 +15,7 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 import React, { Component, PropTypes } from 'react';
+import nullable from '../../../util/nullable-proptype';
 import BigNumber from 'bignumber.js';
 import { Checkbox } from 'material-ui';
 import InfoIcon from 'material-ui/svg-icons/action/info-outline';
@@ -27,8 +28,6 @@ import { Form, Input } from '../../../ui';
 import terms from '../terms-of-service';
 import styles from './gatherData.css';
 
-const nullable = (type) => PropTypes.oneOfType([ PropTypes.oneOf([ null ]), type ]);
-
 export default class GatherData extends Component {
   static propTypes = {
     fee: React.PropTypes.instanceOf(BigNumber),
diff --git a/js/src/modals/SMSVerification/SendConfirmation/sendConfirmation.js b/js/src/modals/SMSVerification/SendConfirmation/sendConfirmation.js
index b6d4f3dca..a3c8e3e18 100644
--- a/js/src/modals/SMSVerification/SendConfirmation/sendConfirmation.js
+++ b/js/src/modals/SMSVerification/SendConfirmation/sendConfirmation.js
@@ -15,6 +15,7 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 import React, { Component, PropTypes } from 'react';
+import nullable from '../../../util/nullable-proptype';
 
 import TxHash from '../../../ui/TxHash';
 import {
@@ -23,9 +24,6 @@ import {
 
 import styles from './sendConfirmation.css';
 
-// TODO: move this to a better place
-const nullable = (type) => PropTypes.oneOfType([ PropTypes.oneOf([ null ]), type ]);
-
 export default class SendConfirmation extends Component {
   static propTypes = {
     step: PropTypes.any.isRequired,
diff --git a/js/src/modals/SMSVerification/SendRequest/sendRequest.js b/js/src/modals/SMSVerification/SendRequest/sendRequest.js
index 31190f628..6f9a6077f 100644
--- a/js/src/modals/SMSVerification/SendRequest/sendRequest.js
+++ b/js/src/modals/SMSVerification/SendRequest/sendRequest.js
@@ -15,6 +15,7 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 import React, { Component, PropTypes } from 'react';
+import nullable from '../../../util/nullable-proptype';
 
 import TxHash from '../../../ui/TxHash';
 import {
@@ -23,9 +24,6 @@ import {
 
 import styles from './sendRequest.css';
 
-// TODO: move this to a better place
-const nullable = (type) => PropTypes.oneOfType([ PropTypes.oneOf([ null ]), type ]);
-
 export default class SendRequest extends Component {
   static propTypes = {
     step: PropTypes.any.isRequired,
diff --git a/js/src/util/nullable-proptype.js b/js/src/util/nullable-proptype.js
new file mode 100644
index 000000000..331be6c18
--- /dev/null
+++ b/js/src/util/nullable-proptype.js
@@ -0,0 +1,21 @@
+// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+import { PropTypes } from 'react';
+
+export default function (type) {
+  return PropTypes.oneOfType([ PropTypes.oneOf([ null ]), type ]);
+}
diff --git a/js/src/views/Signer/components/SignRequest/SignRequest.js b/js/src/views/Signer/components/SignRequest/SignRequest.js
index 395bc2c7f..719ddeec9 100644
--- a/js/src/views/Signer/components/SignRequest/SignRequest.js
+++ b/js/src/views/Signer/components/SignRequest/SignRequest.js
@@ -15,6 +15,7 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 import React, { Component, PropTypes } from 'react';
+import nullable from '../../../../util/nullable-proptype';
 
 import Account from '../Account';
 import TransactionPendingForm from '../TransactionPendingForm';
@@ -22,8 +23,6 @@ import TxHashLink from '../TxHashLink';
 
 import styles from './SignRequest.css';
 
-const nullable = (type) => React.PropTypes.oneOfType([ React.PropTypes.oneOf([ null ]), type ]);
-
 export default class SignRequest extends Component {
   static contextTypes = {
     api: PropTypes.object
diff --git a/js/src/views/Signer/components/TransactionFinished/TransactionFinished.js b/js/src/views/Signer/components/TransactionFinished/TransactionFinished.js
index 08ed1f7ed..00d6a057f 100644
--- a/js/src/views/Signer/components/TransactionFinished/TransactionFinished.js
+++ b/js/src/views/Signer/components/TransactionFinished/TransactionFinished.js
@@ -15,6 +15,7 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 import React, { Component, PropTypes } from 'react';
+import nullable from '../../../../util/nullable-proptype';
 
 import CircularProgress from 'material-ui/CircularProgress';
 
@@ -29,8 +30,6 @@ import styles from './TransactionFinished.css';
 import * as tUtil from '../util/transaction';
 import { capitalize } from '../util/util';
 
-const nullable = (type) => React.PropTypes.oneOfType([ React.PropTypes.oneOf([ null ]), type ]);
-
 export default class TransactionFinished extends Component {
   static contextTypes = {
     api: PropTypes.object.isRequired

From 7b866b4a1ba027977d100abac720b99ed0d96e2c Mon Sep 17 00:00:00 2001
From: GitLab Build Bot <jaco+gitlab@ethcore.io>
Date: Thu, 17 Nov 2016 14:13:10 +0000
Subject: [PATCH 52/57] [ci skip] js-precompiled 20161117-141135

---
 Cargo.lock      | 2 +-
 js/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ad1cc15a1..82bc6b228 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1249,7 +1249,7 @@ dependencies = [
 [[package]]
 name = "parity-ui-precompiled"
 version = "1.4.0"
-source = "git+https://github.com/ethcore/js-precompiled.git#957c5a66c33f3b06a7ae804ac5edc59c20e4535b"
+source = "git+https://github.com/ethcore/js-precompiled.git#29e57214f3c988f0d3c97fef152a4bb927c5c3b3"
 dependencies = [
  "parity-dapps-glue 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
diff --git a/js/package.json b/js/package.json
index 2a2b6d590..e2da3484d 100644
--- a/js/package.json
+++ b/js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "parity.js",
-  "version": "0.2.50",
+  "version": "0.2.51",
   "main": "release/index.js",
   "jsnext:main": "src/index.js",
   "author": "Parity Team <admin@parity.io>",

From b79d65c0f34aab9b4f36b1d1a88c752fabac5e2e Mon Sep 17 00:00:00 2001
From: GitLab Build Bot <jaco+gitlab@ethcore.io>
Date: Thu, 17 Nov 2016 16:02:23 +0000
Subject: [PATCH 53/57] [ci skip] js-precompiled 20161117-160039

---
 Cargo.lock      | 2 +-
 js/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 82bc6b228..46ddc5f07 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1249,7 +1249,7 @@ dependencies = [
 [[package]]
 name = "parity-ui-precompiled"
 version = "1.4.0"
-source = "git+https://github.com/ethcore/js-precompiled.git#29e57214f3c988f0d3c97fef152a4bb927c5c3b3"
+source = "git+https://github.com/ethcore/js-precompiled.git#b2513e92603b473799d653583bd86771e0063c08"
 dependencies = [
  "parity-dapps-glue 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
diff --git a/js/package.json b/js/package.json
index 8c2146917..af56140b1 100644
--- a/js/package.json
+++ b/js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "parity.js",
-  "version": "0.2.51",
+  "version": "0.2.52",
   "main": "release/index.js",
   "jsnext:main": "src/index.js",
   "author": "Parity Team <admin@parity.io>",

From 11ccacd6d0a9989d07b941a77f7a4e9f5a6f7bb3 Mon Sep 17 00:00:00 2001
From: keorn <pczaban@gmail.com>
Date: Thu, 17 Nov 2016 18:32:12 +0000
Subject: [PATCH 54/57] dont keep account provider in miner

---
 ethcore/src/engines/authority_round.rs | 14 ++++++++++----
 ethcore/src/engines/basic_authority.rs | 10 ++++++++--
 ethcore/src/engines/instant_seal.rs    |  3 +--
 ethcore/src/engines/mod.rs             |  5 +++--
 ethcore/src/miner/miner.rs             | 24 ++++++------------------
 parity/run.rs                          |  8 ++++----
 6 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/ethcore/src/engines/authority_round.rs b/ethcore/src/engines/authority_round.rs
index 9bed99e8b..2d7a5d69b 100644
--- a/ethcore/src/engines/authority_round.rs
+++ b/ethcore/src/engines/authority_round.rs
@@ -68,6 +68,7 @@ pub struct AuthorityRound {
 	builtins: BTreeMap<Address, Builtin>,
 	transition_service: IoService<BlockArrived>,
 	message_channel: Mutex<Option<IoChannel<ClientIoMessage>>>,
+	account_provider: Mutex<Option<Arc<AccountProvider>>>,
 	step: AtomicUsize,
 	proposed: AtomicBool,
 }
@@ -101,6 +102,7 @@ impl AuthorityRound {
 				builtins: builtins,
 				transition_service: try!(IoService::<BlockArrived>::start()),
 				message_channel: Mutex::new(None),
+				account_provider: Mutex::new(None),
 				step: AtomicUsize::new(initial_step),
 				proposed: AtomicBool::new(false)
 			});
@@ -219,12 +221,12 @@ impl Engine for AuthorityRound {
 	///
 	/// This operation is synchronous and may (quite reasonably) not be available, in which `false` will
 	/// be returned.
-	fn generate_seal(&self, block: &ExecutedBlock, accounts: Option<&AccountProvider>) -> Option<Vec<Bytes>> {
+	fn generate_seal(&self, block: &ExecutedBlock) -> Option<Vec<Bytes>> {
 		if self.proposed.load(AtomicOrdering::SeqCst) { return None; }
 		let header = block.header();
 		let step = self.step();
 		if self.is_step_proposer(step, header.author()) {
-			if let Some(ap) = accounts {
+			if let Some(ref ap) = *self.account_provider.lock() {
 				// Account should be permanently unlocked, otherwise sealing will fail.
 				if let Ok(signature) = ap.sign(*header.author(), None, header.bare_hash()) {
 					trace!(target: "poa", "generate_seal: Issuing a block for step {}.", step);
@@ -307,8 +309,12 @@ impl Engine for AuthorityRound {
 	}
 
 	fn register_message_channel(&self, message_channel: IoChannel<ClientIoMessage>) {
-		let mut guard = self.message_channel.lock();
-		*guard = Some(message_channel);
+		*self.message_channel.lock() = Some(message_channel);
+	}
+
+
+	fn register_account_provider(&self, account_provider: Arc<AccountProvider>) {
+		*self.account_provider.lock() = Some(account_provider);
 	}
 }
 
diff --git a/ethcore/src/engines/basic_authority.rs b/ethcore/src/engines/basic_authority.rs
index 23a97967c..82a590b38 100644
--- a/ethcore/src/engines/basic_authority.rs
+++ b/ethcore/src/engines/basic_authority.rs
@@ -58,6 +58,7 @@ pub struct BasicAuthority {
 	params: CommonParams,
 	our_params: BasicAuthorityParams,
 	builtins: BTreeMap<Address, Builtin>,
+	account_provider: Mutex<Option<Arc<AccountProvider>>>
 }
 
 impl BasicAuthority {
@@ -67,6 +68,7 @@ impl BasicAuthority {
 			params: params,
 			our_params: our_params,
 			builtins: builtins,
+			account_provider: Mutex::new(None)
 		}
 	}
 }
@@ -113,8 +115,8 @@ impl Engine for BasicAuthority {
 	///
 	/// This operation is synchronous and may (quite reasonably) not be available, in which `false` will
 	/// be returned.
-	fn generate_seal(&self, block: &ExecutedBlock, accounts: Option<&AccountProvider>) -> Option<Vec<Bytes>> {
-		if let Some(ap) = accounts {
+	fn generate_seal(&self, block: &ExecutedBlock) -> Option<Vec<Bytes>> {
+		if let Some(ref ap) = *self.account_provider.lock() {
 			let header = block.header();
 			let message = header.bare_hash();
 			// account should be pernamently unlocked, otherwise sealing will fail
@@ -179,6 +181,10 @@ impl Engine for BasicAuthority {
 	fn verify_transaction(&self, t: &SignedTransaction, _header: &Header) -> Result<(), Error> {
 		t.sender().map(|_|()) // Perform EC recovery and cache sender
 	}
+
+	fn register_account_provider(&self, ap: Arc<AccountProvider>) {
+		*self.account_provider.lock() = Some(ap);
+	}
 }
 
 #[cfg(test)]
diff --git a/ethcore/src/engines/instant_seal.rs b/ethcore/src/engines/instant_seal.rs
index 3dc78d1a2..7351ac90d 100644
--- a/ethcore/src/engines/instant_seal.rs
+++ b/ethcore/src/engines/instant_seal.rs
@@ -23,7 +23,6 @@ use spec::CommonParams;
 use evm::Schedule;
 use block::ExecutedBlock;
 use util::Bytes;
-use account_provider::AccountProvider;
 
 /// An engine which does not provide any consensus mechanism, just seals blocks internally.
 pub struct InstantSeal {
@@ -60,7 +59,7 @@ impl Engine for InstantSeal {
 
 	fn is_sealer(&self, _author: &Address) -> Option<bool> { Some(true) }
 
-	fn generate_seal(&self, _block: &ExecutedBlock, _accounts: Option<&AccountProvider>) -> Option<Vec<Bytes>> {
+	fn generate_seal(&self, _block: &ExecutedBlock) -> Option<Vec<Bytes>> {
 		Some(Vec::new())
 	}
 }
diff --git a/ethcore/src/engines/mod.rs b/ethcore/src/engines/mod.rs
index c70a19de8..e2e194d3c 100644
--- a/ethcore/src/engines/mod.rs
+++ b/ethcore/src/engines/mod.rs
@@ -91,7 +91,7 @@ pub trait Engine : Sync + Send {
 	///
 	/// This operation is synchronous and may (quite reasonably) not be available, in which None will
 	/// be returned.
-	fn generate_seal(&self, _block: &ExecutedBlock, _accounts: Option<&AccountProvider>) -> Option<Vec<Bytes>> { None }
+	fn generate_seal(&self, _block: &ExecutedBlock) -> Option<Vec<Bytes>> { None }
 
 	/// Phase 1 quick block verification. Only does checks that are cheap. `block` (the header's full block)
 	/// may be provided for additional checks. Returns either a null `Ok` or a general error detailing the problem with import.
@@ -146,5 +146,6 @@ pub trait Engine : Sync + Send {
 
 	/// Add a channel for communication with Client which can be used for sealing.
 	fn register_message_channel(&self, _message_channel: IoChannel<ClientIoMessage>) {}
-	// TODO: sealing stuff - though might want to leave this for later.
+	/// Add an account provider useful for Engines that sign stuff.
+	fn register_account_provider(&self, _account_provider: Arc<AccountProvider>) {}
 }
diff --git a/ethcore/src/miner/miner.rs b/ethcore/src/miner/miner.rs
index 84e29458d..845d6aeed 100644
--- a/ethcore/src/miner/miner.rs
+++ b/ethcore/src/miner/miner.rs
@@ -19,7 +19,6 @@ use std::time::{Instant, Duration};
 
 use util::*;
 use util::using_queue::{UsingQueue, GetAction};
-use account_provider::AccountProvider;
 use views::{BlockView, HeaderView};
 use state::{State, CleanupMode};
 use client::{MiningBlockChainClient, Executive, Executed, EnvInfo, TransactOptions, BlockID, CallAnalytics};
@@ -220,14 +219,13 @@ pub struct Miner {
 	extra_data: RwLock<Bytes>,
 	engine: Arc<Engine>,
 
-	accounts: Option<Arc<AccountProvider>>,
 	work_poster: Option<WorkPoster>,
 	gas_pricer: Mutex<GasPricer>,
 }
 
 impl Miner {
 	/// Creates new instance of miner.
-	fn new_raw(options: MinerOptions, gas_pricer: GasPricer, spec: &Spec, accounts: Option<Arc<AccountProvider>>) -> Miner {
+	fn new_raw(options: MinerOptions, gas_pricer: GasPricer, spec: &Spec) -> Miner {
 		let work_poster = match options.new_work_notify.is_empty() {
 			true => None,
 			false => Some(WorkPoster::new(&options.new_work_notify))
@@ -261,26 +259,20 @@ impl Miner {
 			author: RwLock::new(Address::default()),
 			extra_data: RwLock::new(Vec::new()),
 			options: options,
-			accounts: accounts,
 			engine: spec.engine.clone(),
 			work_poster: work_poster,
 			gas_pricer: Mutex::new(gas_pricer),
 		}
 	}
 
-	/// Creates new instance of miner with accounts and with given spec.
-	pub fn with_spec_and_accounts(spec: &Spec, accounts: Option<Arc<AccountProvider>>) -> Miner {
-		Miner::new_raw(Default::default(), GasPricer::new_fixed(20_000_000_000u64.into()), spec, accounts)
-	}
-
-	/// Creates new instance of miner without accounts, but with given spec.
+	/// Creates new instance of miner with given spec.
 	pub fn with_spec(spec: &Spec) -> Miner {
-		Miner::new_raw(Default::default(), GasPricer::new_fixed(20_000_000_000u64.into()), spec, None)
+		Miner::new_raw(Default::default(), GasPricer::new_fixed(20_000_000_000u64.into()), spec)
 	}
 
 	/// Creates new instance of a miner Arc.
-	pub fn new(options: MinerOptions, gas_pricer: GasPricer, spec: &Spec, accounts: Option<Arc<AccountProvider>>) -> Arc<Miner> {
-		Arc::new(Miner::new_raw(options, gas_pricer, spec, accounts))
+	pub fn new(options: MinerOptions, gas_pricer: GasPricer, spec: &Spec) -> Arc<Miner> {
+		Arc::new(Miner::new_raw(options, gas_pricer, spec))
 	}
 
 	fn forced_sealing(&self) -> bool {
@@ -461,10 +453,7 @@ impl Miner {
 	/// Err(Some(block)) returns for unsuccesful sealing while Err(None) indicates misspecified engine.
 	fn seal_block_internally(&self, block: ClosedBlock) -> Result<SealedBlock, Option<ClosedBlock>> {
 		trace!(target: "miner", "seal_block_internally: block has transaction - attempting internal seal.");
-		let s = self.engine.generate_seal(block.block(), match self.accounts {
-			Some(ref x) => Some(&**x),
-			None => None,
-		});
+		let s = self.engine.generate_seal(block.block());
 		if let Some(seal) = s {
 			trace!(target: "miner", "seal_block_internally: managed internal seal. importing...");
 			block.lock().try_seal(&*self.engine, seal).or_else(|_| {
@@ -1170,7 +1159,6 @@ mod tests {
 			},
 			GasPricer::new_fixed(0u64.into()),
 			&Spec::new_test(),
-			None, // accounts provider
 		)).ok().expect("Miner was just created.")
 	}
 
diff --git a/parity/run.rs b/parity/run.rs
index 2cc791f8c..aae4db748 100644
--- a/parity/run.rs
+++ b/parity/run.rs
@@ -203,11 +203,8 @@ pub fn execute(cmd: RunCmd, logger: Arc<RotatingLogger>) -> Result<(), String> {
 	sync_config.fork_block = spec.fork_block();
 	sync_config.warp_sync = cmd.warp_sync;
 
-	// prepare account provider
-	let account_provider = Arc::new(try!(prepare_account_provider(&cmd.dirs, cmd.acc_conf)));
-
 	// create miner
-	let miner = Miner::new(cmd.miner_options, cmd.gas_pricer.into(), &spec, Some(account_provider.clone()));
+	let miner = Miner::new(cmd.miner_options, cmd.gas_pricer.into(), &spec);
 	miner.set_author(cmd.miner_extras.author);
 	miner.set_gas_floor_target(cmd.miner_extras.gas_floor_target);
 	miner.set_gas_ceil_target(cmd.miner_extras.gas_ceil_target);
@@ -241,6 +238,9 @@ pub fn execute(cmd: RunCmd, logger: Arc<RotatingLogger>) -> Result<(), String> {
 	// create supervisor
 	let mut hypervisor = modules::hypervisor(&cmd.dirs.ipc_path());
 
+	// prepare account provider
+	let account_provider = Arc::new(try!(prepare_account_provider(&cmd.dirs, cmd.acc_conf)));
+
 	// create client service.
 	let service = try!(ClientService::start(
 		client_config,

From 11b6578bc324d91b38038e0e035900303da086e9 Mon Sep 17 00:00:00 2001
From: keorn <pczaban@gmail.com>
Date: Thu, 17 Nov 2016 18:46:50 +0000
Subject: [PATCH 55/57] update tests

---
 ethcore/src/engines/authority_round.rs | 9 +++++----
 ethcore/src/engines/basic_authority.rs | 3 ++-
 ethcore/src/engines/instant_seal.rs    | 9 ++-------
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/ethcore/src/engines/authority_round.rs b/ethcore/src/engines/authority_round.rs
index 2d7a5d69b..ee07b0262 100644
--- a/ethcore/src/engines/authority_round.rs
+++ b/ethcore/src/engines/authority_round.rs
@@ -388,6 +388,7 @@ mod tests {
 
 		let spec = Spec::new_test_round();
 		let engine = &*spec.engine;
+		engine.register_account_provider(Arc::new(tap));
 		let genesis_header = spec.genesis_header();
 		let mut db1 = get_temp_state_db().take();
 		spec.ensure_db_good(&mut db1).unwrap();
@@ -399,16 +400,16 @@ mod tests {
 		let b2 = OpenBlock::new(engine, Default::default(), false, db2, &genesis_header, last_hashes, addr2, (3141562.into(), 31415620.into()), vec![]).unwrap();
 		let b2 = b2.close_and_lock();
 
-		if let Some(seal) = engine.generate_seal(b1.block(), Some(&tap)) {
+		if let Some(seal) = engine.generate_seal(b1.block()) {
 			assert!(b1.clone().try_seal(engine, seal).is_ok());
 			// Second proposal is forbidden.
-			assert!(engine.generate_seal(b1.block(), Some(&tap)).is_none());
+			assert!(engine.generate_seal(b1.block()).is_none());
 		}
 
-		if let Some(seal) = engine.generate_seal(b2.block(), Some(&tap)) {
+		if let Some(seal) = engine.generate_seal(b2.block()) {
 			assert!(b2.clone().try_seal(engine, seal).is_ok());
 			// Second proposal is forbidden.
-			assert!(engine.generate_seal(b2.block(), Some(&tap)).is_none());
+			assert!(engine.generate_seal(b2.block()).is_none());
 		}
 	}
 
diff --git a/ethcore/src/engines/basic_authority.rs b/ethcore/src/engines/basic_authority.rs
index 82a590b38..c43495967 100644
--- a/ethcore/src/engines/basic_authority.rs
+++ b/ethcore/src/engines/basic_authority.rs
@@ -259,6 +259,7 @@ mod tests {
 
 		let spec = new_test_authority();
 		let engine = &*spec.engine;
+		engine.register_account_provider(Arc::new(tap));
 		let genesis_header = spec.genesis_header();
 		let mut db_result = get_temp_state_db();
 		let mut db = db_result.take();
@@ -266,7 +267,7 @@ mod tests {
 		let last_hashes = Arc::new(vec![genesis_header.hash()]);
 		let b = OpenBlock::new(engine, Default::default(), false, db, &genesis_header, last_hashes, addr, (3141562.into(), 31415620.into()), vec![]).unwrap();
 		let b = b.close_and_lock();
-		let seal = engine.generate_seal(b.block(), Some(&tap)).unwrap();
+		let seal = engine.generate_seal(b.block()).unwrap();
 		assert!(b.try_seal(engine, seal).is_ok());
 	}
 
diff --git a/ethcore/src/engines/instant_seal.rs b/ethcore/src/engines/instant_seal.rs
index 7351ac90d..7491d47f3 100644
--- a/ethcore/src/engines/instant_seal.rs
+++ b/ethcore/src/engines/instant_seal.rs
@@ -68,16 +68,12 @@ impl Engine for InstantSeal {
 mod tests {
 	use util::*;
 	use tests::helpers::*;
-	use account_provider::AccountProvider;
 	use spec::Spec;
 	use header::Header;
 	use block::*;
 
 	#[test]
 	fn instant_can_seal() {
-		let tap = AccountProvider::transient_provider();
-		let addr = tap.insert_account("".sha3(), "").unwrap();
-
 		let spec = Spec::new_instant();
 		let engine = &*spec.engine;
 		let genesis_header = spec.genesis_header();
@@ -85,10 +81,9 @@ mod tests {
 		let mut db = db_result.take();
 		spec.ensure_db_good(&mut db).unwrap();
 		let last_hashes = Arc::new(vec![genesis_header.hash()]);
-		let b = OpenBlock::new(engine, Default::default(), false, db, &genesis_header, last_hashes, addr, (3141562.into(), 31415620.into()), vec![]).unwrap();
+		let b = OpenBlock::new(engine, Default::default(), false, db, &genesis_header, last_hashes, Address::default(), (3141562.into(), 31415620.into()), vec![]).unwrap();
 		let b = b.close_and_lock();
-		// Seal with empty AccountProvider.
-		let seal = engine.generate_seal(b.block(), Some(&tap)).unwrap();
+		let seal = engine.generate_seal(b.block()).unwrap();
 		assert!(b.try_seal(engine, seal).is_ok());
 	}
 

From a521fda24e667e5d8432dfa9a8dd41dfa98e4017 Mon Sep 17 00:00:00 2001
From: keorn <pczaban@gmail.com>
Date: Thu, 17 Nov 2016 19:04:02 +0000
Subject: [PATCH 56/57] update rpc module test

---
 rpc/src/v1/tests/eth.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/rpc/src/v1/tests/eth.rs b/rpc/src/v1/tests/eth.rs
index 2f5131f32..1ff5e1771 100644
--- a/rpc/src/v1/tests/eth.rs
+++ b/rpc/src/v1/tests/eth.rs
@@ -50,7 +50,7 @@ fn sync_provider() -> Arc<TestSyncProvider> {
 	}))
 }
 
-fn miner_service(spec: &Spec, accounts: Arc<AccountProvider>) -> Arc<Miner> {
+fn miner_service(spec: &Spec) -> Arc<Miner> {
 	Miner::new(
 		MinerOptions {
 			new_work_notify: vec![],
@@ -69,7 +69,6 @@ fn miner_service(spec: &Spec, accounts: Arc<AccountProvider>) -> Arc<Miner> {
 		},
 		GasPricer::new_fixed(20_000_000_000u64.into()),
 		&spec,
-		Some(accounts),
 	)
 }
 
@@ -116,7 +115,8 @@ impl EthTester {
 	fn from_spec(spec: Spec) -> Self {
 		let dir = RandomTempPath::new();
 		let account_provider = account_provider();
-		let miner_service = miner_service(&spec, account_provider.clone());
+		spec.engine.register_account_provider(account_provider.clone());
+		let miner_service = miner_service(&spec);
 		let snapshot_service = snapshot_service();
 
 		let db_config = ::util::kvdb::DatabaseConfig::with_columns(::ethcore::db::NUM_COLUMNS);

From 9d8ac7a09b49a1e5263209ae1130181c1708c149 Mon Sep 17 00:00:00 2001
From: keorn <pczaban@gmail.com>
Date: Thu, 17 Nov 2016 19:08:00 +0000
Subject: [PATCH 57/57] extra line [ci skip]

---
 ethcore/src/engines/authority_round.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ethcore/src/engines/authority_round.rs b/ethcore/src/engines/authority_round.rs
index ee07b0262..ab2b41aec 100644
--- a/ethcore/src/engines/authority_round.rs
+++ b/ethcore/src/engines/authority_round.rs
@@ -312,7 +312,6 @@ impl Engine for AuthorityRound {
 		*self.message_channel.lock() = Some(message_channel);
 	}
 
-
 	fn register_account_provider(&self, account_provider: Arc<AccountProvider>) {
 		*self.account_provider.lock() = Some(account_provider);
 	}