status-im
/
embark-area-51
mirror of https://github.com/status-im/embark-area-51.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

PR feedback: Use request

This commit is contained in:
Anthony Laibe 2018-08-21 11:38:05 +01:00 committed by Pascal Precht
parent 6038da4339
commit d9ae5cbfc7
No known key found for this signature in database
GPG Key ID: 0EE28D8D6FD85D7D
1 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/modules/contracts_manager/index.js
View File

@ -108,9 +108,10 @@ class ContractsManager {
return res.send({error: error.message}); return res.send({error: error.message});
} }
const {account, contract} = result; const {account, contract} = result;
const contractObj = new web3.eth.Contract(contract.abiDefinition, contract.deployedAddress);
const abi = contract.abiDefinition.find(definition => definition.name === req.body.method); const abi = contract.abiDefinition.find(definition => definition.name === req.body.method);
const funcCall = (abi.constant === true || abi.stateMutability === 'view' || abi.stateMutability === 'pure') ? 'call' : 'send'; const funcCall = (abi.constant === true || abi.stateMutability === 'view' || abi.stateMutability === 'pure') ? 'call' : 'send';
self.events.request("blockchain:contract:create", {abi: contract.abiDefinition, address: contract.deployedAddress}, (contractObj) => {
try { try {
contractObj.methods[req.body.method].apply(this, req.body.inputs)[funcCall]({from: account}, (error, result) => { contractObj.methods[req.body.method].apply(this, req.body.inputs)[funcCall]({from: account}, (error, result) => {
if (error) { if (error) {
@ -123,6 +124,7 @@ class ContractsManager {
res.send({result: e.message}); res.send({result: e.message});
} }
}); });
});
} }
); );
@ -137,20 +139,23 @@ class ContractsManager {
account: (callback) => { account: (callback) => {
self.events.request("blockchain:defaultAccount:get", (account) => callback(null, account)); self.events.request("blockchain:defaultAccount:get", (account) => callback(null, account));
} }
}, async (error, result) => { }, (error, result) => {
if (error) { if (error) {
return res.send({error: error.message}); return res.send({error: error.message});
} }
const {account, contract} = result; const {account, contract} = result;
const contractObj = new web3.eth.Contract(contract.abiDefinition);
self.events.request("blockchain:contract:create", {abi: contract.abiDefinition}, async (contractObj) => {
try { try {
let gas = await contractObj.deploy({data: `0x${contract.code}`, arguments: req.body.inputs}).estimateGas(); const params = {data: `0x${contract.code}`, arguments: req.body.inputs};
let newContract = await contractObj.deploy({data: `0x${contract.code}`, arguments: req.body.inputs}).send({from: account, gas}); let gas = await contractObj.deploy(params).estimateGas();
let newContract = await contractObj.deploy(params).send({from: account, gas});
res.send({result: newContract._address}); res.send({result: newContract._address});
} catch (e) { } catch (e) {
res.send({result: e.message}); res.send({result: e.message});
} }
}); });
});
} }
); );