From bfc18c10e06422533b2ac2cf7311410ce03d4b8a Mon Sep 17 00:00:00 2001 From: Ricardo Guilherme Schmidt <3esmit@gmail.com> Date: Fri, 19 May 2017 20:49:41 -0300 Subject: [PATCH] fixed import path and pragmas --- contracts/AbstractToken.sol | 4 ++-- contracts/Bank.sol | 5 ++--- contracts/CollaborationBank.sol | 8 ++++---- contracts/EpochLocker.sol | 6 +++--- contracts/Lockable.sol | 6 +++--- contracts/LockerToken.sol | 2 +- contracts/Token.sol | 2 +- 7 files changed, 16 insertions(+), 17 deletions(-) diff --git a/contracts/AbstractToken.sol b/contracts/AbstractToken.sol index 79e407b..16b35bf 100644 --- a/contracts/AbstractToken.sol +++ b/contracts/AbstractToken.sol @@ -1,5 +1,3 @@ -pragma solidity ^0.4.8; - /** * AbstractToken ECR20-compliant token contract * Child should implement initial supply or minting and overwite base @@ -10,6 +8,8 @@ pragma solidity ^0.4.8; import "./Token.sol"; +pragma solidity ^0.4.11; + // AbstractToken, ECR20 tokens that all belong to the owner for sending around contract AbstractToken is Token { diff --git a/contracts/Bank.sol b/contracts/Bank.sol index e12081d..0eb8459 100644 --- a/contracts/Bank.sol +++ b/contracts/Bank.sol @@ -1,5 +1,4 @@ -pragma solidity ^0.4.9; - +pragma solidity ^0.4.11; contract Bank { @@ -16,4 +15,4 @@ contract Bank { if(!dest.send(amount)) throw; Withdrawn(msg.sender, amount); } -} \ No newline at end of file +} diff --git a/contracts/CollaborationBank.sol b/contracts/CollaborationBank.sol index cad9581..6acf011 100644 --- a/contracts/CollaborationBank.sol +++ b/contracts/CollaborationBank.sol @@ -1,5 +1,3 @@ -pragma solidity ^0.4.0; - /** * Abstract contract used for recieving donations or profits * Withdraw is divided by total tokens each account owns @@ -13,8 +11,10 @@ pragma solidity ^0.4.0; */ import "./Bank.sol"; -import "../management/EpochLocker.sol"; -import "../token/LockerToken.sol"; +import "EpochLocker.sol"; +import "LockerToken.sol"; + +pragma solidity ^0.4.11; contract CollaborationBank is Bank, EpochLocker { diff --git a/contracts/EpochLocker.sol b/contracts/EpochLocker.sol index c98c240..9dd2484 100644 --- a/contracts/EpochLocker.sol +++ b/contracts/EpochLocker.sol @@ -1,11 +1,11 @@ -pragma solidity ^0.4.8; - /** * Abstract contract that locks and unlock in period of a time. * */ -import "lib/ethereans/management/Lockable.sol"; +import "Lockable.sol"; + +pragma solidity ^0.4.11; contract EpochLocker is Lockable { diff --git a/contracts/Lockable.sol b/contracts/Lockable.sol index 0edd67e..426bf55 100644 --- a/contracts/Lockable.sol +++ b/contracts/Lockable.sol @@ -1,7 +1,7 @@ -pragma solidity ^0.4.8; - import "./Owned.sol"; +pragma solidity ^0.4.8; + contract Lockable { bool public lock = true; event Locked(bool lock); @@ -11,4 +11,4 @@ contract Lockable { lock = _lock; } -} \ No newline at end of file +} diff --git a/contracts/LockerToken.sol b/contracts/LockerToken.sol index ed915ca..ff27710 100644 --- a/contracts/LockerToken.sol +++ b/contracts/LockerToken.sol @@ -8,7 +8,7 @@ pragma solidity ^0.4.0; */ import "./AbstractToken.sol"; -import "../management/Lockable.sol"; +import "Lockable.sol"; contract LockerToken is AbstractToken, Lockable, Owned { Lockable public locker = this; diff --git a/contracts/Token.sol b/contracts/Token.sol index bf66e03..a98fd80 100644 --- a/contracts/Token.sol +++ b/contracts/Token.sol @@ -11,4 +11,4 @@ contract Token { function approve(address spender, uint256 value) returns (bool ok); event Transfer(address indexed from, address indexed to, uint256 value); event Approval(address indexed owner, address indexed spender, uint256 value); -} \ No newline at end of file +}