Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
O
openzeppelin-contracts-upgradeable
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
俞永鹏
openzeppelin-contracts-upgradeable
Commits
4de772f5
Commit
4de772f5
authored
May 08, 2017
by
Maxim Averin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add destroy function, allowing send funds to recepient
parent
f7a7fc3b
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
3 deletions
+21
-3
Destructible.sol
contracts/lifecycle/Destructible.sol
+5
-0
killable.rst
docs/source/killable.rst
+7
-2
Destructible.js
test/Destructible.js
+9
-1
No files found.
contracts/lifecycle/Destructible.sol
View file @
4de772f5
...
@@ -7,9 +7,14 @@ import "../ownership/Ownable.sol";
...
@@ -7,9 +7,14 @@ import "../ownership/Ownable.sol";
/*
/*
* Destructible
* Destructible
* Base contract that can be destroyed by owner. All funds in contract will be sent to the owner.
* Base contract that can be destroyed by owner. All funds in contract will be sent to the owner.
* In second function all funds will be sent to the recepient.
*/
*/
contract Destructible is Ownable {
contract Destructible is Ownable {
function destroy() onlyOwner {
function destroy() onlyOwner {
selfdestruct(owner);
selfdestruct(owner);
}
}
function destroyAndSendRecepient(address _recipient) onlyOwner {
selfdestruct(_recipient);
}
}
}
docs/source/killable.rst
View file @
4de772f5
...
@@ -8,4 +8,9 @@ Inherits from contract Ownable.
...
@@ -8,4 +8,9 @@ Inherits from contract Ownable.
destroy( ) onlyOwner
destroy( ) onlyOwner
"""""""""""""""""""
"""""""""""""""""""
Destroys the contract and sends funds back to the owner.
Destroys the contract and sends funds back to the owner.
\ No newline at end of file
destroyAndSendRecepient(address _recipient) onlyOwner
"""""""""""""""""""
Destroys the contract and sends funds back to the _recepient.
\ No newline at end of file
test/Destructible.js
View file @
4de772f5
...
@@ -11,8 +11,16 @@ contract('Destructible', function(accounts) {
...
@@ -11,8 +11,16 @@ contract('Destructible', function(accounts) {
let
initBalance
=
web3
.
eth
.
getBalance
(
owner
);
let
initBalance
=
web3
.
eth
.
getBalance
(
owner
);
await
destructible
.
destroy
({
from
:
owner
});
await
destructible
.
destroy
({
from
:
owner
});
let
newBalance
=
web3
.
eth
.
getBalance
(
owner
);
let
newBalance
=
web3
.
eth
.
getBalance
(
owner
);
assert
.
isTrue
(
newBalance
>
initBalance
);
assert
.
isTrue
(
newBalance
>
initBalance
);
});
});
it
(
'should send balance to recepient after destruction'
,
async
function
()
{
let
destructible
=
await
Destructible
.
new
({
from
:
accounts
[
0
],
value
:
web3
.
toWei
(
'10'
,
'ether'
)});
let
owner
=
await
destructible
.
owner
();
let
initBalance
=
web3
.
eth
.
getBalance
(
accounts
[
1
]);
await
destructible
.
destroyAndSendRecepient
(
accounts
[
1
],
{
from
:
owner
}
);
let
newBalance
=
web3
.
eth
.
getBalance
(
accounts
[
1
]);
assert
.
isTrue
(
newBalance
.
greaterThan
(
initBalance
));
});
});
});
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment