Skip to content
This repository has been archived by the owner on Mar 11, 2024. It is now read-only.

Upgrades #24

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@ build_webpack
.env
npm-debug.log
.truffle-solidity-loader
package-lock.json
5 changes: 3 additions & 2 deletions contracts/Authentication.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity ^0.4.2;
pragma solidity 0.4.18;

import './zeppelin/lifecycle/Killable.sol';

Expand All @@ -25,8 +25,9 @@ contract Authentication is Killable {
_;
}

function login() constant
function login()
public
view
onlyExistingUser
returns (bytes32) {
return (users[msg.sender].name);
Expand Down
2 changes: 1 addition & 1 deletion contracts/Migrations.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity ^0.4.2;
pragma solidity 0.4.18;

contract Migrations {
address public owner;
Expand Down
4 changes: 2 additions & 2 deletions contracts/zeppelin/lifecycle/Killable.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity ^0.4.4;
pragma solidity 0.4.18;


import "./../ownership/Ownable.sol";
Expand All @@ -9,7 +9,7 @@ import "./../ownership/Ownable.sol";
* Base contract that can be killed by owner. All funds in contract will be sent to the owner.
*/
contract Killable is Ownable {
function kill() onlyOwner {
function kill() public onlyOwner {
selfdestruct(owner);
}
}
6 changes: 3 additions & 3 deletions contracts/zeppelin/ownership/Ownable.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity ^0.4.4;
pragma solidity 0.4.18;


/*
Expand All @@ -10,7 +10,7 @@ pragma solidity ^0.4.4;
contract Ownable {
address public owner;

function Ownable() {
function Ownable() public {
owner = msg.sender;
}

Expand All @@ -19,7 +19,7 @@ contract Ownable {
_;
}

function transferOwnership(address newOwner) onlyOwner {
function transferOwnership(address newOwner) public onlyOwner {
if (newOwner != address(0)) owner = newOwner;
}

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"recursive-readdir": "2.1.0",
"strip-ansi": "3.0.1",
"style-loader": "0.13.1",
"truffle-contract": "^1.1.8",
"truffle-contract": "^3.0.0",
"url-loader": "0.5.7",
"webpack": "1.14.0",
"webpack-dev-server": "1.16.2",
Expand Down