diff --git a/contracts/IdentityFactory.sol b/contracts/IdentityFactory.sol index 2c581d2..5c83695 100644 --- a/contracts/IdentityFactory.sol +++ b/contracts/IdentityFactory.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.4.11; +pragma solidity 0.4.11; import "./RecoveryQuorum.sol"; diff --git a/contracts/IdentityFactoryWithRecoveryKey.sol b/contracts/IdentityFactoryWithRecoveryKey.sol index c6e0db3..1ee2ece 100644 --- a/contracts/IdentityFactoryWithRecoveryKey.sol +++ b/contracts/IdentityFactoryWithRecoveryKey.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.4.11; +pragma solidity 0.4.11; import "./RecoverableController.sol"; diff --git a/contracts/IdentityManager.sol b/contracts/IdentityManager.sol index f9990c8..797f220 100644 --- a/contracts/IdentityManager.sol +++ b/contracts/IdentityManager.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.4.11; +pragma solidity 0.4.11; import "./Proxy.sol"; contract IdentityManager { diff --git a/contracts/MetaIdentityManager.sol b/contracts/MetaIdentityManager.sol index c21f16f..71b0361 100644 --- a/contracts/MetaIdentityManager.sol +++ b/contracts/MetaIdentityManager.sol @@ -56,7 +56,7 @@ contract MetaIdentityManager { } modifier onlyOwner(address identity, address sender) { - if (owners[identity][sender] > 0 && (owners[identity][sender] + userTimeLock) <= now ) _ ; + if (isOwner(identity, sender)) _ ; else throw; } diff --git a/contracts/Proxy.sol b/contracts/Proxy.sol index 6d38c0d..ff32e2e 100644 --- a/contracts/Proxy.sol +++ b/contracts/Proxy.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.4.11; +pragma solidity 0.4.11; import "./libs/Owned.sol"; diff --git a/contracts/RecoverableController.sol b/contracts/RecoverableController.sol index 2f026d1..9e9f9bf 100644 --- a/contracts/RecoverableController.sol +++ b/contracts/RecoverableController.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.4.11; +pragma solidity 0.4.11; import "./Proxy.sol"; @@ -92,4 +92,3 @@ contract RecoverableController { userKey = _userKey; } } - diff --git a/contracts/RecoveryQuorum.sol b/contracts/RecoveryQuorum.sol index b177ded..4d78de6 100644 --- a/contracts/RecoveryQuorum.sol +++ b/contracts/RecoveryQuorum.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.4.11; +pragma solidity 0.4.11; import "./RecoverableController.sol"; import "./libs/ArrayLib.sol"; diff --git a/contracts/libs/Owned.sol b/contracts/libs/Owned.sol index ca15699..a042af9 100644 --- a/contracts/libs/Owned.sol +++ b/contracts/libs/Owned.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.4.11; +pragma solidity 0.4.11; contract Owned { diff --git a/contracts/misc/Migrations.sol b/contracts/misc/Migrations.sol index 4dd0c07..d97d245 100644 --- a/contracts/misc/Migrations.sol +++ b/contracts/misc/Migrations.sol @@ -1,4 +1,5 @@ -pragma solidity ^0.4.11; +pragma solidity 0.4.11; + contract Migrations { address public owner; diff --git a/contracts/misc/TestRegistry.sol b/contracts/misc/TestRegistry.sol index c62af9d..862726a 100644 --- a/contracts/misc/TestRegistry.sol +++ b/contracts/misc/TestRegistry.sol @@ -1,5 +1,5 @@ // This contract is only used for testing purposes. -pragma solidity ^0.4.8; +pragma solidity 0.4.11; contract TestRegistry {