cerc-io/solidity
16
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

Merge pull request #256 from chriseth/selfdestruct

Browse Source 
Introduce selfdestruct alias for suicide.
This commit is contained in:
chriseth 2015-11-30 16:06:18 +01:00
commit a8736b7b27
5 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libsolidity/analysis/GlobalContext.cpp
View File

@ -39,7 +39,9 @@ m_magicVariables(vector<shared_ptr<MagicVariableDeclaration const>>{make_shared<
make_shared<MagicVariableDeclaration>("tx", make_shared<MagicType>(MagicType::Kind::Transaction)), make_shared<MagicVariableDeclaration>("tx", make_shared<MagicType>(MagicType::Kind::Transaction)),
make_shared<MagicVariableDeclaration>("now", make_shared<IntegerType>(256)), make_shared<MagicVariableDeclaration>("now", make_shared<IntegerType>(256)),
make_shared<MagicVariableDeclaration>("suicide", make_shared<MagicVariableDeclaration>("suicide",
make_shared<FunctionType>(strings{"address"}, strings{}, FunctionType::Location::Suicide)), make_shared<FunctionType>(strings{"address"}, strings{}, FunctionType::Location::Selfdestruct)),
make_shared<MagicVariableDeclaration>("selfdestruct",
make_shared<FunctionType>(strings{"address"}, strings{}, FunctionType::Location::Selfdestruct)),
make_shared<MagicVariableDeclaration>("addmod", make_shared<MagicVariableDeclaration>("addmod",
make_shared<FunctionType>(strings{"uint256", "uint256", "uint256"}, strings{"uint256"}, FunctionType::Location::AddMod)), make_shared<FunctionType>(strings{"uint256", "uint256", "uint256"}, strings{"uint256"}, FunctionType::Location::AddMod)),
make_shared<MagicVariableDeclaration>("mulmod", make_shared<MagicVariableDeclaration>("mulmod",

2
libsolidity/ast/Types.h
View File

@ -739,7 +739,7 @@ public:
Creation, ///< external call using CREATE Creation, ///< external call using CREATE
Send, ///< CALL, but without data and gas Send, ///< CALL, but without data and gas
SHA3, ///< SHA3 SHA3, ///< SHA3
Suicide, ///< SUICIDE Selfdestruct, ///< SELFDESTRUCT
ECRecover, ///< CALL to special contract for ecrecover ECRecover, ///< CALL to special contract for ecrecover
SHA256, ///< CALL to special contract for sha256 SHA256, ///< CALL to special contract for sha256
RIPEMD160, ///< CALL to special contract for ripemd160 RIPEMD160, ///< CALL to special contract for ripemd160

2
libsolidity/codegen/ExpressionCompiler.cpp
View File

@ -535,7 +535,7 @@ bool ExpressionCompiler::visit(FunctionCall const& _functionCall)
{} {}
); );
break; break;
case Location::Suicide: case Location::Selfdestruct:
arguments.front()->accept(*this); arguments.front()->accept(*this);
utils().convertType(*arguments.front()->annotation().type, *function.parameterTypes().front(), true); utils().convertType(*arguments.front()->annotation().type, *function.parameterTypes().front(), true);
m_context << eth::Instruction::SUICIDE; m_context << eth::Instruction::SUICIDE;

4
test/contracts/Wallet.cpp
View File

@ -361,9 +361,9 @@ contract Wallet is multisig, multiowned, daylimit {
multiowned(_owners, _required) daylimit(_daylimit) { multiowned(_owners, _required) daylimit(_daylimit) {
} }
// kills the contract sending everything to `_to`. // destroys the contract sending everything to `_to`.
function kill(address _to) onlymanyowners(sha3(msg.data)) external { function kill(address _to) onlymanyowners(sha3(msg.data)) external {
suicide(_to); selfdestruct(_to);
} }
// gets called when no other function matches // gets called when no other function matches

16
test/libsolidity/SolidityEndToEndTest.cpp
View File

@ -1483,6 +1483,22 @@ BOOST_AUTO_TEST_CASE(suicide)
BOOST_CHECK_EQUAL(m_state.balance(address), amount); BOOST_CHECK_EQUAL(m_state.balance(address), amount);
} }
BOOST_AUTO_TEST_CASE(selfdestruct)
{
char const* sourceCode = "contract test {\n"
" function a(address receiver) returns (uint ret) {\n"
" selfdestruct(receiver);\n"
" return 10;\n"
" }\n"
"}\n";
u256 amount(130);
compileAndRun(sourceCode, amount);
u160 address(23);
BOOST_CHECK(callContractFunction("a(address)", address) == bytes());
BOOST_CHECK(!m_state.addressHasCode(m_contractAddress));
BOOST_CHECK_EQUAL(m_state.balance(address), amount);
}
BOOST_AUTO_TEST_CASE(sha3) BOOST_AUTO_TEST_CASE(sha3)
{ {
char const* sourceCode = "contract test {\n" char const* sourceCode = "contract test {\n"