Skip to content

B
baas-ide
Commit f80e2fae authored by chriseth's avatar chriseth
Browse files
Options

Merge pull request #129 from lastperson/patch-3

Fix runTx constant call with args to real eth node
parents 2d8ed0b5 ef8d8350
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 12 deletions
assets/js/universal-dapp.js
View file @ f80e2fae
......@@ -434,22 +434,19 @@ UniversalDApp.prototype.runTx = function( data, args, cb) {
var value = self.options.getValue ? self.options.getValue : 0;
if (!this.vm) {
var tx = {
from: self.options.getAddress ? self.options.getAddress() : web3.eth.accounts[0],
to: to,
data: data,
gas: gas,
value: value
};
if (constant && !isConstructor) {
var func = web3.eth.contract( [args.abi] ).at( to );
func[args.abi.name].call( cb );
web3.eth.call( tx, cb );
} else {
var tx = {
from: self.options.getAddress ? self.options.getAddress() : web3.eth.accounts[0],
to: to,
data: data,
gas: gas,
value: value
};
web3.eth.estimateGas( tx, function(err, resp){
tx.gas = resp;
if (!err) web3.eth.sendTransaction( tx, function(err, resp) {
cb( err, resp );
});
if (!err) web3.eth.sendTransaction( tx, cb );
else cb( err, resp);
});
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment