Skip to content

B
baas-ide
Commit 00e2a951 authored by chriseth's avatar chriseth Committed by GitHub
Browse files
Options

Merge pull request #469 from ethereum/gasEstimation

Disable gas estimation
parents b713ce1a f9fdd342
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 1 deletion
src/app/txRunner.js
View file @ 00e2a951
...@@ -76,11 +76,14 @@ TxRunner.prototype.execute = function () { ...@@ -76,11 +76,14 @@ TxRunner.prototype.execute = function () {
// NOTE: estimateGas very likely will return a large limit if execution of the code failed // NOTE: estimateGas very likely will return a large limit if execution of the code failed
// we want to be able to run the code in order to debug and find the cause for the failure // we want to be able to run the code in order to debug and find the cause for the failure
var blockGasLimit = Math.floor(block.gasLimit - block.gasLimit / 1024) var blockGasLimit = Math.floor(block.gasLimit - block.gasLimit / 1024)
tx.gas = blockGasLimit < gasEstimation ? blockGasLimit : gasEstimation // tx.gas = blockGasLimit < gasEstimation ? blockGasLimit : gasEstimation
tx.gas = blockGasLimit // that's temporary, uncomment when the following is fixed https://github.com/ethereum/go-ethereum/issues/3653
/* same as above
if (tx.gas > gasLimit) { if (tx.gas > gasLimit) {
return callback('Gas required exceeds limit: ' + tx.gas) return callback('Gas required exceeds limit: ' + tx.gas)
} }
*/
var sendTransaction = self.personalMode ? self.web3.personal.sendTransaction : self.web3.eth.sendTransaction var sendTransaction = self.personalMode ? self.web3.personal.sendTransaction : self.web3.eth.sendTransaction
sendTransaction(tx, function (err, resp) { sendTransaction(tx, function (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