Skip to content

Azavalla feature/inheritable contract #680

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

Merged
eternauta1337 merged 25 commits into from
Jan 18, 2018
Merged

Azavalla feature/inheritable contract #680

Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
4fe2157
Inheritable contract
azavalla Nov 23, 2017
2a560ad
name fix
azavalla Nov 23, 2017
b709206
fixes
azavalla Nov 24, 2017
a613cd0
added example use-case for Inheritable.sol
azavalla Nov 27, 2017
a8afb20
Use Inherited event instead of OwnershipTransfered
azavalla Nov 29, 2017
d808e49
changed 'pronounce' for 'proclaim'
azavalla Nov 29, 2017
80ae074
marked ownerLives as view
azavalla Nov 29, 2017
560a855
further example documentation
azavalla Nov 29, 2017
4332135
changed events names on inheritable test
azavalla Nov 29, 2017
c7807c5
changed view for constant
azavalla Nov 29, 2017
5716492
setHeartbeatTimeout: public --> internal
azavalla Nov 29, 2017
e596046
owner can't be set as heir
azavalla Nov 29, 2017
82c8512
changed Inherited event for OwnershipTransfered
azavalla Nov 30, 2017
46736da
added test for SimpleSavingsWallet
azavalla Nov 30, 2017
c70ee93
[Inheritable.js] replace assertJump for expectThrow
azavalla Nov 30, 2017
fe712c6
[SimpleSavingsWallet.js] replace assertJump for expectThrow
azavalla Nov 30, 2017
52b6181
renamed Inheritable --> Heritable
azavalla Nov 30, 2017
51c2c50
[Heritable] ownerLives(): constant --> view
azavalla Nov 30, 2017
5ea9bd4
[Heritable] added HeirOwnershipClaimed event
azavalla Nov 30, 2017
3009553
Update test names and js style
eternauta1337 Jan 16, 2018
22c1403
Fix solidity style issue
eternauta1337 Jan 16, 2018
9d005b4
Explicit uint size
eternauta1337 Jan 16, 2018
c01203b
Index addreses in events and explicit uint size
eternauta1337 Jan 18, 2018
a5ea0af
Merge branch 'master' into azavalla-feature/inheritable-contract
eternauta1337 Jan 18, 2018
c8c0f21
Merge branch 'master' into azavalla-feature/inheritable-contract
eternauta1337 Jan 18, 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
Use Inherited event instead of OwnershipTransfered
  • Loading branch information
@azavalla @eternauta1337
azavalla authored and eternauta1337 committed Jan 18, 2018
commit a8afb20c2093b660f563cd593f8311a678e1eb11
3 changes: 2 additions & 1 deletion contracts/ownership/Inheritable.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,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 Inherited(address indexed previousOwner, address indexed newOwner);


/**
Expand Down Expand Up @@ -86,7 +87,7 @@ contract Inheritable is Ownable {
function inherit() public onlyHeir {
require(!ownerLives());
require(now >= timeOfDeath + heartbeatTimeout);
OwnershipTransferred(owner, heir);
Inherited(owner, heir);
owner = heir;
timeOfDeath = 0;
}
Expand Down