|
|
@ -481,7 +481,7 @@ UniversalDApp.prototype.getCallButton = function (args) { |
|
|
|
} else if (args.abi.constant && !isConstructor) { |
|
|
|
} else if (args.abi.constant && !isConstructor) { |
|
|
|
replaceOutput($result, getReturnOutput(result)); |
|
|
|
replaceOutput($result, getReturnOutput(result)); |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
tryTillResponse(result, function (err, result) { |
|
|
|
tryTillResponse(self.web3, result, function (err, result) { |
|
|
|
if (err) { |
|
|
|
if (err) { |
|
|
|
replaceOutput($result, $('<span/>').text(err).addClass('error')); |
|
|
|
replaceOutput($result, $('<span/>').text(err).addClass('error')); |
|
|
|
} else if (isConstructor) { |
|
|
|
} else if (isConstructor) { |
|
|
@ -569,7 +569,7 @@ UniversalDApp.prototype.deployLibrary = function (contractName, cb) { |
|
|
|
self.getContractByName(contractName).address = result.createdAddress; |
|
|
|
self.getContractByName(contractName).address = result.createdAddress; |
|
|
|
cb(err, result.createdAddress); |
|
|
|
cb(err, result.createdAddress); |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
tryTillResponse(result, function(err, finalResult) { |
|
|
|
tryTillResponse(self.web3, result, function(err, finalResult) { |
|
|
|
if (err) return cb(err); |
|
|
|
if (err) return cb(err); |
|
|
|
self.getContractByName(contractName).address = finalResult.contractAddress; |
|
|
|
self.getContractByName(contractName).address = finalResult.contractAddress; |
|
|
|
cb(null, finalResult.contractAddress); |
|
|
|
cb(null, finalResult.contractAddress); |
|
|
@ -653,12 +653,12 @@ UniversalDApp.prototype.runTx = function (data, args, cb) { |
|
|
|
} |
|
|
|
} |
|
|
|
}; |
|
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|
function tryTillResponse (txhash, done) { |
|
|
|
function tryTillResponse (web3, txhash, done) { |
|
|
|
this.web3.eth.getTransactionReceipt(txhash, testResult); |
|
|
|
web3.eth.getTransactionReceipt(txhash, testResult); |
|
|
|
|
|
|
|
|
|
|
|
function testResult (err, address) { |
|
|
|
function testResult (err, address) { |
|
|
|
if (!err && !address) { |
|
|
|
if (!err && !address) { |
|
|
|
setTimeout(function () { tryTillResponse(txhash, done); }, 500); |
|
|
|
setTimeout(function () { tryTillResponse(web3, txhash, done); }, 500); |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
done(err, address); |
|
|
|
done(err, address); |
|
|
|
} |
|
|
|
} |
|
|
|