Skip to content

[Feature] Heritable contract #595

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
azavalla wants to merge 20 commits into from
Closed

[Feature] Heritable contract #595

Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
afb2c0f
Inheritable contract
azavalla Nov 23, 2017
dfc58f4
name fix
azavalla Nov 23, 2017
12f9b12
fixes
azavalla Nov 24, 2017
947e8f9
added example use-case for Inheritable.sol
azavalla Nov 27, 2017
c5d63f8
Use Inherited event instead of OwnershipTransfered
azavalla Nov 29, 2017
d15c02e
changed 'pronounce' for 'proclaim'
azavalla Nov 29, 2017
fc4d436
marked ownerLives as view
azavalla Nov 29, 2017
dcdde0c
further example documentation
azavalla Nov 29, 2017
38135c5
changed events names on inheritable test
azavalla Nov 29, 2017
4f563df
changed view for constant
azavalla Nov 29, 2017
fc4b95a
setHeartbeatTimeout: public --> internal
azavalla Nov 29, 2017
a31ba00
owner can't be set as heir
azavalla Nov 29, 2017
8949b3e
changed Inherited event for OwnershipTransfered
azavalla Nov 30, 2017
52f8f67
added test for SimpleSavingsWallet
azavalla Nov 30, 2017
367cf25
[Inheritable.js] replace assertJump for expectThrow
azavalla Nov 30, 2017
a63fef7
[SimpleSavingsWallet.js] replace assertJump for expectThrow
azavalla Nov 30, 2017
6853b3d
renamed Inheritable --> Heritable
azavalla Nov 30, 2017
02e45c7
[Heritable] ownerLives(): constant --> view
azavalla Nov 30, 2017
4bbeae5
[Heritable] added HeirOwnershipClaimed event
azavalla Nov 30, 2017
f2b0282
Merge branch 'master' into feature/inheritable-contract
eternauta1337 Jan 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
changed 'pronounce' for 'proclaim'
  • Loading branch information
@azavalla
azavalla committed Nov 30, 2017
commit d15c02e60c77b17c3e0e59672e03d72bb166a539
6 changes: 3 additions & 3 deletions contracts/ownership/Inheritable.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ contract Inheritable is Ownable {

event HeirChanged(address indexed owner, address indexed newHeir);
event OwnerHeartbeated(address indexed owner);
event OwnerPronouncedDead(address indexed owner, address indexed heir, uint timeOfDeath);
event OwnerProclaimedDead(address indexed owner, address indexed heir, uint timeOfDeath);
event Inherited(address indexed previousOwner, address indexed newOwner);


Expand Down Expand Up @@ -67,9 +67,9 @@ contract Inheritable is Ownable {
* @dev Heir can pronounce the owners death. To inherit the ownership, they will
* have to wait for `heartbeatTimeout` seconds.
*/
function pronounceDeath() public onlyHeir {
function proclaimDeath() public onlyHeir {
require(ownerLives());
OwnerPronouncedDead(owner, heir, timeOfDeath);
OwnerProclaimedDead(owner, heir, timeOfDeath);
timeOfDeath = now;
}

Expand Down