Adding approveAndCallGasRelayed base component
This commit is contained in:
Richard Ramos
parent
293c585d87
commit
520859cd27
|
|
@ -0,0 +1,250 @@
|
|||
import Web3 from 'web3';
|
||||
|
||||
import React from 'react';
|
||||
import { Grid, Row, Form, FormGroup, FormControl, HelpBlock, Button, ControlLabel, Col, InputGroup, Alert } from 'react-bootstrap';
|
||||
|
||||
class ApproveAndCallGasRelayed extends React.Component {
|
||||
|
||||
constructor(props) {
|
||||
super(props);
|
||||
|
||||
this.state = {
|
||||
address: this.props.IdentityGasRelay.options.address,
|
||||
topic: '0x4964656e',
|
||||
to: '0x00',
|
||||
value: 0,
|
||||
data: '0x00',
|
||||
nonce: 0,
|
||||
gasPrice: 0,
|
||||
gasLimit: 0,
|
||||
gasToken: "0x0000000000000000000000000000000000000000",
|
||||
signature: '',
|
||||
symKey: '0xd0d905c1c62b810b787141430417caf2b3f54cffadb395b7bb39fdeb8f17266b',
|
||||
kid: null,
|
||||
skid: null,
|
||||
msgSent: '',
|
||||
payload: '',
|
||||
messages: [],
|
||||
web3W: null,
|
||||
errorMessage: ''
|
||||
};
|
||||
}
|
||||
|
||||
componentDidMount(){
|
||||
__embarkContext.execWhenReady(async () => {
|
||||
|
||||
let web3W = new Web3('ws://localhost:8546');
|
||||
|
||||
let _skid = await web3W.shh.addSymKey(this.state.symKey);
|
||||
let _kid = await web3W.shh.newKeyPair();
|
||||
|
||||
this.setState({
|
||||
kid: _kid,
|
||||
skid: _skid,
|
||||
whisper: web3W
|
||||
});
|
||||
|
||||
web3W.shh.subscribe('messages', {
|
||||
"privateKeyID": _kid,
|
||||
"ttl": 20,
|
||||
"minPow": 0.8,
|
||||
"powTime": 1000
|
||||
}, (error, message, subscription) => {
|
||||
if(error) {
|
||||
console.log(error);
|
||||
this.setState({errorMessage: error.message})
|
||||
} else {
|
||||
this.state.messages.push(this.props.web3.utils.hexToAscii(message.payload));
|
||||
this.setState({messages: this.state.messages})
|
||||
}
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
handleChange(e, name){
|
||||
this.state[name] = e.target.value;
|
||||
this.setState(this.state);
|
||||
}
|
||||
|
||||
async sendMessage(e){
|
||||
|
||||
e.preventDefault();
|
||||
|
||||
this.setState({
|
||||
messages: [],
|
||||
errorMessage: ''
|
||||
});
|
||||
|
||||
try {
|
||||
let jsonAbi = this.props.IdentityGasRelay._jsonInterface.filter(x => x.name == "callGasRelayed")[0]
|
||||
let funCall = this.props.web3.eth.abi.encodeFunctionCall(jsonAbi, [this.state.to,
|
||||
this.state.value,
|
||||
this.state.data,
|
||||
this.state.nonce,
|
||||
this.state.gasPrice,
|
||||
this.state.gasLimit,
|
||||
this.state.gasToken,
|
||||
this.state.signature]);
|
||||
let msgObj = {
|
||||
symKeyID: this.state.skid,
|
||||
sig: this.state.kid,
|
||||
ttl: 1000,
|
||||
powTarget: 1,
|
||||
powTime: 20,
|
||||
topic: this.state.topic,
|
||||
payload: this.state.address + funCall.slice(2)
|
||||
};
|
||||
|
||||
console.log(msgObj);
|
||||
|
||||
this.props.web3.shh.post(msgObj)
|
||||
.then((err, result) => {
|
||||
console.log(result);
|
||||
console.log(err);
|
||||
this.setState({msgSent: result, payload: msgObj.payload});
|
||||
});
|
||||
} catch(error){
|
||||
console.error(error);
|
||||
this.setState({errorMessage: error.message})
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
async sign(ev){
|
||||
ev.preventDefault();
|
||||
|
||||
this.setState({
|
||||
msgSent: false,
|
||||
payload: '',
|
||||
messages: [],
|
||||
errorMessage: ''
|
||||
});
|
||||
|
||||
try {
|
||||
let message = await this.props.IdentityGasRelay.methods.callGasRelayHash(
|
||||
this.state.to,
|
||||
this.state.value,
|
||||
this.props.web3.utils.soliditySha3({t: 'bytes', v: this.state.data}),
|
||||
this.state.nonce,
|
||||
this.state.gasPrice,
|
||||
this.state.gasLimit,
|
||||
this.state.gasToken
|
||||
).call();
|
||||
|
||||
let accounts = await this.props.web3.eth.getAccounts();
|
||||
let _signature = await this.props.web3.eth.sign(message, accounts[0]);
|
||||
|
||||
this.setState({signature: _signature});
|
||||
} catch(error){
|
||||
console.error(error);
|
||||
this.setState({errorMessage: error.message})
|
||||
}
|
||||
}
|
||||
|
||||
render(){
|
||||
return (<Grid>
|
||||
{
|
||||
this.state.errorMessage != '' ?
|
||||
<React.Fragment>
|
||||
<Alert bsStyle="danger">{this.state.errorMessage}</Alert>
|
||||
</React.Fragment> : ''
|
||||
}
|
||||
<Form>
|
||||
<Row>
|
||||
<Col md={9}>
|
||||
<ControlLabel>Identity Address</ControlLabel>
|
||||
<InputGroup>
|
||||
<InputGroup.Addon>0x</InputGroup.Addon>
|
||||
<FormControl type="text" placeholder="Address" defaultValue={this.state.address} onChange={(ev) => this.handleChange(ev, 'address')} />
|
||||
</InputGroup>
|
||||
</Col>
|
||||
</Row>
|
||||
<Row>
|
||||
<Col md={4}>
|
||||
<ControlLabel>To</ControlLabel>
|
||||
<InputGroup>
|
||||
<InputGroup.Addon>0x</InputGroup.Addon>
|
||||
<FormControl type="text" defaultValue={this.state.to} onChange={(ev) => this.handleChange(ev, 'to')} />
|
||||
</InputGroup>
|
||||
</Col>
|
||||
<Col md={1}>
|
||||
<ControlLabel>Value</ControlLabel>
|
||||
<FormControl type="string" defaultValue={this.state.value} onChange={(ev) => this.handleChange(ev, 'value')} />
|
||||
</Col>
|
||||
<Col md={4}>
|
||||
<ControlLabel>Data</ControlLabel>
|
||||
<InputGroup>
|
||||
<InputGroup.Addon>0x</InputGroup.Addon>
|
||||
<FormControl type="string" defaultValue={this.state.data} onChange={(ev) => this.handleChange(ev, 'data')} />
|
||||
</InputGroup>
|
||||
</Col>
|
||||
</Row>
|
||||
<Row>
|
||||
<Col md={1}>
|
||||
<ControlLabel>Nonce</ControlLabel>
|
||||
<FormControl type="string" defaultValue={this.state.nonce} onChange={(ev) => this.handleChange(ev, 'nonce')} />
|
||||
</Col>
|
||||
<Col md={1}>
|
||||
<ControlLabel>Gas Price</ControlLabel>
|
||||
<FormControl type="string" defaultValue={this.state.gasPrice} onChange={(ev) => this.handleChange(ev, 'gasPrice')} />
|
||||
</Col>
|
||||
<Col md={1}>
|
||||
<ControlLabel>Gas Limit</ControlLabel>
|
||||
<FormControl type="string" defaultValue={this.state.gasLimit} onChange={(ev) => this.handleChange(ev, 'gasLimit')} />
|
||||
</Col>
|
||||
<Col md={6}>
|
||||
<ControlLabel>Gas Token</ControlLabel>
|
||||
<InputGroup>
|
||||
<InputGroup.Addon>0x</InputGroup.Addon>
|
||||
<FormControl type="text" defaultValue={this.state.gasToken} onChange={(ev) => this.handleChange(ev, 'gasToken')} />
|
||||
</InputGroup>
|
||||
<HelpBlock>RND: {this.props.RND.options.address}</HelpBlock>
|
||||
<HelpBlock>ETH: 0x0000000000000000000000000000000000000000</HelpBlock>
|
||||
</Col>
|
||||
</Row>
|
||||
<Row>
|
||||
<Col md={4}>
|
||||
<Button bsStyle="primary" onClick={(ev) => this.sign(ev)}>1. Sign Message</Button>
|
||||
</Col>
|
||||
<Col md={5}>
|
||||
<b>Signature: </b>{this.state.signature}
|
||||
</Col>
|
||||
</Row>
|
||||
<Row>
|
||||
<Col md={7}>
|
||||
<ControlLabel>Symmetric Key</ControlLabel>
|
||||
<InputGroup>
|
||||
<InputGroup.Addon>0x</InputGroup.Addon>
|
||||
<FormControl type="text" placeholder="Sym Key" defaultValue={this.state.symKey} readOnly={true} />
|
||||
</InputGroup>
|
||||
</Col>
|
||||
<Col md={2}>
|
||||
<ControlLabel>Topic</ControlLabel>
|
||||
<InputGroup>
|
||||
<InputGroup.Addon>0x</InputGroup.Addon>
|
||||
<FormControl type="text" readOnly={true} defaultValue={this.state.topic} onChange={(ev) => this.handleChange(ev, 'topic')} />
|
||||
</InputGroup>
|
||||
</Col>
|
||||
</Row>
|
||||
<Row>
|
||||
<Col md={4}>
|
||||
<Button bsStyle="primary" disabled={this.state.signature == ""} onClick={(ev) => this.sendMessage(ev)}>2. Send via whisper</Button>
|
||||
</Col>
|
||||
<Col md={5}>
|
||||
{this.state.msgSent}
|
||||
</Col>
|
||||
</Row>
|
||||
|
||||
<Row>
|
||||
<h3>Whisper Messages</h3>
|
||||
{
|
||||
this.state.messages.map((msg, i) => <p key={i}>{msg}</p>)
|
||||
}
|
||||
</Row>
|
||||
</Form>
|
||||
</Grid>
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
export default ApproveAndCallGasRelayed;
|
||||
|
|
@ -1,10 +1,7 @@
|
|||
import EmbarkJS from 'Embark/EmbarkJS';
|
||||
import IdentityGasRelay from 'Embark/contracts/IdentityGasRelay';
|
||||
import RND from 'Embark/contracts/RND';
|
||||
import Web3 from 'web3';
|
||||
|
||||
import React from 'react';
|
||||
import { Grid, Row, Form, FormGroup, FormControl, HelpBlock, Button, ControlLabel, Col, InputGroup } from 'react-bootstrap';
|
||||
import { Grid, Row, Form, FormGroup, FormControl, HelpBlock, Button, ControlLabel, Col, InputGroup, Alert } from 'react-bootstrap';
|
||||
|
||||
class CallGasRelayed extends React.Component {
|
||||
|
||||
|
|
@ -12,7 +9,7 @@ class CallGasRelayed extends React.Component {
|
|||
super(props);
|
||||
|
||||
this.state = {
|
||||
address: IdentityGasRelay.options.address,
|
||||
address: this.props.IdentityGasRelay.options.address,
|
||||
topic: '0x4964656e',
|
||||
to: '0x00',
|
||||
value: 0,
|
||||
|
|
@ -28,12 +25,9 @@ class CallGasRelayed extends React.Component {
|
|||
msgSent: '',
|
||||
payload: '',
|
||||
messages: [],
|
||||
web3W: null
|
||||
web3W: null,
|
||||
errorMessage: ''
|
||||
};
|
||||
|
||||
window['RND'] = RND;
|
||||
window['IdentityGasRelay'] = IdentityGasRelay;
|
||||
|
||||
}
|
||||
|
||||
componentDidMount(){
|
||||
|
|
@ -56,10 +50,11 @@ class CallGasRelayed extends React.Component {
|
|||
"minPow": 0.8,
|
||||
"powTime": 1000
|
||||
}, (error, message, subscription) => {
|
||||
if(error)
|
||||
if(error) {
|
||||
console.log(error);
|
||||
else {
|
||||
this.state.messages.push(web3.utils.hexToAscii(message.payload));
|
||||
this.setState({errorMessage: error.message})
|
||||
} else {
|
||||
this.state.messages.push(this.props.web3.utils.hexToAscii(message.payload));
|
||||
this.setState({messages: this.state.messages})
|
||||
}
|
||||
});
|
||||
|
|
@ -75,77 +70,88 @@ class CallGasRelayed extends React.Component {
|
|||
}
|
||||
|
||||
async sendMessage(e){
|
||||
|
||||
e.preventDefault();
|
||||
|
||||
this.setState({
|
||||
messages: []
|
||||
messages: [],
|
||||
errorMessage: ''
|
||||
});
|
||||
|
||||
let jsonAbi = IdentityGasRelay._jsonInterface.filter(x => x.name == "callGasRelayed")[0]
|
||||
try {
|
||||
let jsonAbi = this.props.IdentityGasRelay._jsonInterface.filter(x => x.name == "callGasRelayed")[0]
|
||||
let funCall = this.props.web3.eth.abi.encodeFunctionCall(jsonAbi, [this.state.to,
|
||||
this.state.value,
|
||||
this.state.data,
|
||||
this.state.nonce,
|
||||
this.state.gasPrice,
|
||||
this.state.gasLimit,
|
||||
this.state.gasToken,
|
||||
this.state.signature]);
|
||||
let msgObj = {
|
||||
symKeyID: this.state.skid,
|
||||
sig: this.state.kid,
|
||||
ttl: 1000,
|
||||
powTarget: 1,
|
||||
powTime: 20,
|
||||
topic: this.state.topic,
|
||||
payload: this.state.address + funCall.slice(2)
|
||||
};
|
||||
|
||||
let funCall = web3.eth.abi.encodeFunctionCall(jsonAbi, [this.state.to,
|
||||
this.state.value,
|
||||
this.state.data,
|
||||
this.state.nonce,
|
||||
this.state.gasPrice,
|
||||
this.state.gasLimit,
|
||||
this.state.gasToken,
|
||||
this.state.signature]);
|
||||
let message = this.state.address + funCall.slice(2);
|
||||
console.log(msgObj);
|
||||
|
||||
let msgObj = {
|
||||
symKeyID: this.state.skid,
|
||||
sig: this.state.kid,
|
||||
ttl: 1000,
|
||||
powTarget: 1,
|
||||
powTime: 20,
|
||||
topic: this.state.topic,
|
||||
payload: message
|
||||
};
|
||||
|
||||
console.log(msgObj);
|
||||
|
||||
web3.shh.post(msgObj)
|
||||
.then((err, result) => {
|
||||
console.log(result);
|
||||
console.log(err);
|
||||
this.setState({msgSent: result, payload: message});
|
||||
});
|
||||
this.props.web3.shh.post(msgObj)
|
||||
.then((err, result) => {
|
||||
console.log(result);
|
||||
console.log(err);
|
||||
this.setState({msgSent: result, payload: msgObj.payload});
|
||||
});
|
||||
} catch(error){
|
||||
console.error(error);
|
||||
this.setState({errorMessage: error.message})
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
async sign(ev){
|
||||
ev.preventDefault();
|
||||
|
||||
let dataHash = web3.utils.soliditySha3({t: 'bytes', v: this.state.data} );
|
||||
|
||||
this.setState({
|
||||
msgSent: false,
|
||||
payload: '',
|
||||
messages: []
|
||||
})
|
||||
messages: [],
|
||||
errorMessage: ''
|
||||
});
|
||||
|
||||
let message = await IdentityGasRelay.methods.callGasRelayHash(
|
||||
this.state.to,
|
||||
this.state.value,
|
||||
dataHash,
|
||||
this.state.nonce,
|
||||
this.state.gasPrice,
|
||||
this.state.gasLimit,
|
||||
this.state.gasToken
|
||||
).call();
|
||||
try {
|
||||
let message = await this.props.IdentityGasRelay.methods.callGasRelayHash(
|
||||
this.state.to,
|
||||
this.state.value,
|
||||
this.props.web3.utils.soliditySha3({t: 'bytes', v: this.state.data}),
|
||||
this.state.nonce,
|
||||
this.state.gasPrice,
|
||||
this.state.gasLimit,
|
||||
this.state.gasToken
|
||||
).call();
|
||||
|
||||
console.log("DataHash: " + dataHash);
|
||||
console.log("CallGasRelayHash: " + message);
|
||||
let accounts = await this.props.web3.eth.getAccounts();
|
||||
let _signature = await this.props.web3.eth.sign(message, accounts[0]);
|
||||
|
||||
let accounts = await web3.eth.getAccounts();
|
||||
let _signature = await web3.eth.sign(message, accounts[0]);
|
||||
|
||||
this.setState({signature: _signature});
|
||||
this.setState({signature: _signature});
|
||||
} catch(error){
|
||||
console.error(error);
|
||||
this.setState({errorMessage: error.message})
|
||||
}
|
||||
}
|
||||
|
||||
render(){
|
||||
return (<Grid>
|
||||
{
|
||||
this.state.errorMessage != '' ?
|
||||
<React.Fragment>
|
||||
<Alert bsStyle="danger">{this.state.errorMessage}</Alert>
|
||||
</React.Fragment> : ''
|
||||
}
|
||||
<Form>
|
||||
<Row>
|
||||
<Col md={9}>
|
||||
|
|
@ -195,7 +201,7 @@ class CallGasRelayed extends React.Component {
|
|||
<InputGroup.Addon>0x</InputGroup.Addon>
|
||||
<FormControl type="text" defaultValue={this.state.gasToken} onChange={(ev) => this.handleChange(ev, 'gasToken')} />
|
||||
</InputGroup>
|
||||
<HelpBlock>RND: {RND.options.address}</HelpBlock>
|
||||
<HelpBlock>RND: {this.props.RND.options.address}</HelpBlock>
|
||||
<HelpBlock>ETH: 0x0000000000000000000000000000000000000000</HelpBlock>
|
||||
</Col>
|
||||
</Row>
|
||||
|
|
|
|||
|
|
@ -3,8 +3,11 @@ import ReactDOM from 'react-dom';
|
|||
import { Tabs, Tab } from 'react-bootstrap';
|
||||
|
||||
import EmbarkJS from 'Embark/EmbarkJS';
|
||||
import CallGasRelayed from './components/callgasrelayed';
|
||||
import RND from 'Embark/contracts/RND';
|
||||
import IdentityGasRelay from 'Embark/contracts/IdentityGasRelay';
|
||||
|
||||
import CallGasRelayed from './components/callgasrelayed';
|
||||
import ApproveAndCallGasRelayed from './components/approveandcallgasrelayed';
|
||||
|
||||
import './relayer-test.css';
|
||||
|
||||
|
|
@ -12,6 +15,9 @@ class App extends React.Component {
|
|||
|
||||
constructor(props) {
|
||||
super(props);
|
||||
|
||||
window['RND'] = RND;
|
||||
window['IdentityGasRelay'] = IdentityGasRelay;
|
||||
}
|
||||
|
||||
_renderStatus(title, available){
|
||||
|
|
@ -26,7 +32,10 @@ class App extends React.Component {
|
|||
return (<div><h3>IdentityGasRelay - Usage Example</h3>
|
||||
<Tabs defaultActiveKey={1} id="uncontrolled-tab-example">
|
||||
<Tab eventKey={1} title="callGasRelayed">
|
||||
<CallGasRelayed />
|
||||
<CallGasRelayed IdentityGasRelay={IdentityGasRelay} RND={RND} web3={web3} />
|
||||
</Tab>
|
||||
<Tab eventKey={2} title="approveAndCallGasRelayed">
|
||||
<ApproveAndCallGasRelayed IdentityGasRelay={IdentityGasRelay} RND={RND} web3={web3} />
|
||||
</Tab>
|
||||
</Tabs>
|
||||
</div>);
|
||||
|
|
|
|||
Loading…
Reference in New Issue