mirror of
https://github.com/ethereum/solidity
synced 2023-10-03 13:03:40 +00:00
Merge pull request #1006 from ethereum/nenewaccountgas
Do not pay new account gas.
This commit is contained in:
commit
114502f8ad
@ -34,6 +34,7 @@ Features:
|
||||
* Commandline interface: Using ``-`` as filename allows reading from stdin.
|
||||
* Interface Json: Fallback function is now part of the ABI.
|
||||
* Interface: Version string now semver compatible.
|
||||
* Code generator: Do not provide "new account gas" if we know the called account exists.
|
||||
|
||||
Bugfixes:
|
||||
|
||||
|
@ -1524,11 +1524,13 @@ void ExpressionCompiler::appendExternalFunctionCall(
|
||||
m_context << u256(0);
|
||||
m_context << dupInstruction(m_context.baseToCurrentStackOffset(contractStackPos));
|
||||
|
||||
bool existenceChecked = false;
|
||||
// Check the the target contract exists (has code) for non-low-level calls.
|
||||
if (funKind == FunctionKind::External || funKind == FunctionKind::CallCode || funKind == FunctionKind::DelegateCall)
|
||||
{
|
||||
m_context << Instruction::DUP1 << Instruction::EXTCODESIZE << Instruction::ISZERO;
|
||||
m_context.appendConditionalJumpTo(m_context.errorTag());
|
||||
existenceChecked = true;
|
||||
}
|
||||
|
||||
if (_functionType.gasSet())
|
||||
@ -1540,7 +1542,7 @@ void ExpressionCompiler::appendExternalFunctionCall(
|
||||
u256 gasNeededByCaller = eth::GasCosts::callGas + 10;
|
||||
if (_functionType.valueSet())
|
||||
gasNeededByCaller += eth::GasCosts::callValueTransferGas;
|
||||
if (!isCallCode && !isDelegateCall)
|
||||
if (!isCallCode && !isDelegateCall && !existenceChecked)
|
||||
gasNeededByCaller += eth::GasCosts::callNewAccountGas; // we never know
|
||||
m_context <<
|
||||
gasNeededByCaller <<
|
||||
|
Loading…
Reference in New Issue
Block a user