- fixed gas estimation when storage a null value

microfins · Feb 10, 2016 · 2747ed0 · 2747ed0
1 parent 1ac45b0
commit 2747ed0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/qml/TransactionDialog.qml b/qml/TransactionDialog.qml
@@ -728,7 +728,7 @@ Dialog {
 							{
 								if (rbbuttonList.current.objectName === "trTypeSend")
 								{
-									var gas = codeModel.txGas + codeModel.callStipend
+									var gas = codeModel.txGas
 									estimatedGas.text = qsTr("Estimated cost: ") + gas + " gas"
 								}
 							}

diff --git a/src/MixClient.cpp b/src/MixClient.cpp
@@ -242,7 +242,7 @@ ExecutionResult MixClient::debugTransaction(Transaction const& _t, State const&
 	d.executionCode = std::move(codes);
 	d.transactionData = std::move(data);
 	EVMSchedule schedule; // TODO: make relevant to supposed context.
-	d.gasUsed = er.gasUsed + schedule.callStipend;
+	d.gasUsed = er.gasUsed;
 	d.gasRequired = _t.gasRequired(schedule);
 	d.gasRefunded = er.gasRefunded;
 	if (_t.isCreation())
@@ -260,13 +260,12 @@ void MixClient::executeTransaction(Transaction const& _t, Block& _block, bool _c
 	// execute on a state
 	if (!_call && d.excepted == TransactionException::None)
 	{
-		u256 useGas = min(d.gasUsed, _block.gasLimitRemaining());
-		t = _gasAuto ? replaceGas(_t, useGas, _secret) : _t;
+		t = _gasAuto ? replaceGas(_t, _block.gasLimitRemaining(), _secret) : _t;
 		eth::ExecutionResult const& er = _block.execute(envInfo.lastHashes(), t);
 		if (t.isCreation() && _block.state().code(d.contractAddress).empty())
 			BOOST_THROW_EXCEPTION(OutOfGas() << errinfo_comment("Not enough gas for contract deployment"));
 		EVMSchedule schedule;	// TODO: make relevant to supposed context.
-		d.gasUsed = er.gasUsed + schedule.callStipend;
+		d.gasUsed = er.gasUsed;
 		d.gasRequired = _t.gasRequired(schedule);
 		d.gasRefunded = er.gasRefunded;
 		LocalisedLogEntries logs;