cerc-io/solidity
10
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added fallback function to gas estimation and fixed mix gas estimation.

Browse Source 
Fixes #2156
This commit is contained in:
chriseth 2015-06-18 17:38:26 +02:00
parent f9bbe3279e
commit ffb7d94035
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CommandLineInterface.cpp
View File

@ -273,6 +273,11 @@ void CommandLineInterface::handleGasEstimation(string const& _contract)
GasEstimator::GasConsumption gas = GasEstimator::functionalEstimation(*items, sig); GasEstimator::GasConsumption gas = GasEstimator::functionalEstimation(*items, sig);
cout << " " << sig << ":\t" << gas << endl; cout << " " << sig << ":\t" << gas << endl;
} }
if (contract.getFallbackFunction())
{
GasEstimator::GasConsumption gas = GasEstimator::functionalEstimation(*items, "INVALID");
cout << " fallback:\t" << gas << endl;
}
cout << "internal:" << endl; cout << "internal:" << endl;
for (auto const& it: contract.getDefinedFunctions()) for (auto const& it: contract.getDefinedFunctions())
{ {

2
jsonCompiler.cpp
View File

@ -91,6 +91,8 @@ Json::Value estimateGas(CompilerStack const& _compiler, string const& _contract)
string sig = it.second->externalSignature(); string sig = it.second->externalSignature();
externalFunctions[sig] = gasToJson(GasEstimator::functionalEstimation(*items, sig)); externalFunctions[sig] = gasToJson(GasEstimator::functionalEstimation(*items, sig));
} }
if (contract.getFallbackFunction())
externalFunctions[""] = gasToJson(GasEstimator::functionalEstimation(*items, "INVALID"));
gasEstimates["external"] = externalFunctions; gasEstimates["external"] = externalFunctions;
Json::Value internalFunctions(Json::objectValue); Json::Value internalFunctions(Json::objectValue);
for (auto const& it: contract.getDefinedFunctions()) for (auto const& it: contract.getDefinedFunctions())