solidity v -> 0.4.11, use isOwner in modifier

uport-project · Aug 1, 2017 · fa5bc58 · fa5bc58
1 parent 2021bcb
commit fa5bc58
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 11 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,5 +1,5 @@
 // This contract is only used for testing purposes.
-pragma solidity ^0.4.8;
+pragma solidity 0.4.11;
 
 
 contract TestRegistry {