Skip to content
Merged
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
changed view for constant
  • Loading branch information
azavalla authored and eternauta1337 committed Jan 18, 2018
commit c7807c5b58c9982fe25d4ccb44abafff40cc6285
2 changes: 1 addition & 1 deletion contracts/ownership/Inheritable.sol
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ contract Inheritable is Ownable {
timeOfDeath = 0;
}

function ownerLives() internal view returns (bool) {
function ownerLives() internal constant returns (bool) {
return timeOfDeath == 0;
}
}