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

sms verification: refactor contract call

Browse Source
This commit is contained in:
Jannis R 2016-11-09 12:50:02 +01:00
parent ebf742f2af
commit e84531f31c
No known key found for this signature in database
GPG Key ID: 0FE83946296A88A5
1 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
js/src/modals/SMSVerification/SendRequest/sendRequest.js
View File

@ -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 });