feat: change onwable => administratable

sonm-io · Nov 20, 2018 · 9cf59d4 · 9cf59d4
1 parent 4192c6c
commit 9cf59d4
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 45 deletions.
diff --git a/blockchain/source/contracts/AdministratumCrud.sol b/blockchain/source/contracts/AdministratumCrud.sol
@@ -1,8 +1,8 @@
 pragma solidity ^0.4.23;
 
-import "zeppelin-solidity/contracts/ownership/Ownable.sol";
+import "./Administratable.sol";
 
-contract AdministratumCrud is Ownable {
+contract AdministratumCrud is Administratable {
 
     // events
     event WorkerAnnounced(address indexed worker, address indexed master);
@@ -24,6 +24,7 @@ contract AdministratumCrud is Ownable {
     //constructor
     constructor(){
         owner = msg.sender;
+        administrator = msg.sender;
     }
 
     function SetMaster(address _worker, address _master) public onlyOwner {

diff --git a/blockchain/source/contracts/ChangeRequests.sol b/blockchain/source/contracts/ChangeRequests.sol
@@ -1,11 +1,11 @@
 pragma solidity ^0.4.23;
 
-import "zeppelin-solidity/contracts/ownership/Ownable.sol";
+import "./Administratable.sol";
 import "zeppelin-solidity/contracts/math/SafeMath.sol";
 import "./Orders.sol";
 
 
-contract ChangeRequests is Ownable {
+contract ChangeRequests is Administratable {
     using SafeMath for uint256;
 
     mapping(uint => ChangeRequest) requests;
@@ -33,6 +33,7 @@ contract ChangeRequests is Ownable {
 
     constructor() public {
         owner = msg.sender;
+        administrator = msg.sender;
     }
 
     function Write(

diff --git a/blockchain/source/contracts/Deals.sol b/blockchain/source/contracts/Deals.sol
@@ -1,9 +1,9 @@
 pragma solidity ^0.4.23;
 
-import "zeppelin-solidity/contracts/ownership/Ownable.sol";
+import "./Administratable.sol";
 
 
-contract Deals is Ownable {
+contract Deals is Administratable {
     //events
 
     //enums
@@ -48,44 +48,9 @@ contract Deals is Ownable {
     //Constructor
     constructor() public {
         owner = msg.sender;
+        administrator = msg.sender;
     }
 
-    function Write(
-        uint64[] _benchmarks,
-        address _supplierID,
-        address _consumerID,
-        address _masterID,
-        uint _askID,
-        uint _bidID,
-        uint _duration,
-        uint _price,
-        uint _startTime,
-        uint _endTime,
-        DealStatus _status,
-        uint _blockedBalance,
-        uint _totalPayout,
-        uint _lastBillTS) public onlyOwner returns(uint) {
-
-        dealsAmount += 1;
-
-        deals[dealsAmount].info.benchmarks = _benchmarks;
-        deals[dealsAmount].info.supplierID = _supplierID;
-        deals[dealsAmount].info.consumerID = _consumerID;
-        deals[dealsAmount].info.masterID = _masterID;
-        deals[dealsAmount].info.askID = _askID;
-        deals[dealsAmount].info.bidID = _bidID;
-        deals[dealsAmount].info.startTime = _startTime;
-        deals[dealsAmount].params.duration = _duration;
-        deals[dealsAmount].params.price = _price;
-        deals[dealsAmount].params.endTime = _endTime;
-        deals[dealsAmount].params.status = _status;
-        deals[dealsAmount].params.blockedBalance = _blockedBalance;
-        deals[dealsAmount].params.totalPayout = _totalPayout;
-        deals[dealsAmount].params.lastBillTS = _lastBillTS;
-
-
-        return dealsAmount;
-    }
 
     function SetDealBenchmarks(uint dealID, uint64[] _benchmarks) public onlyOwner {
         deals[dealID].info.benchmarks = _benchmarks;

diff --git a/blockchain/source/contracts/DevicesStorage.sol b/blockchain/source/contracts/DevicesStorage.sol
@@ -0,0 +1,36 @@
+pragma solidity ^0.4.23;
+
+import "zeppelin-solidity/contracts/ownership/Ownable.sol";
+
+
+contract DevicesStorage is Ownable {
+    // DATA
+    mapping (address => bytes) devices;
+
+    // EVENTS
+    event DevicesHasSet(address indexed owner);
+    event DevicesUpdated(address indexed owner);
+
+    // CONTSTRUCTOR
+    constructor() public {
+        owner = msg.sender;
+    }
+
+
+    // SETTERS
+    function SetDevices(bytes _deviceList) public {
+        if (keccak256(devices[msg.sender]) != keccak256 ("")) {
+            emit DevicesUpdated(msg.sender);
+        } else {
+            emit DevicesHasSet(msg.sender);
+        }
+
+        devices[msg.sender] = _deviceList;
+
+    }
+
+    // GETTERS
+    function GetDevices(address _owner) public returns (bytes) {
+        return  devices[_owner];
+    }
+}
diff --git a/blockchain/source/contracts/Market.sol b/blockchain/source/contracts/Market.sol
@@ -212,7 +212,8 @@ contract Market is Ownable, Pausable {
             ordersCrud.GetOrderStatus(_askID) == Orders.OrderStatus.ORDER_ACTIVE
             && ordersCrud.GetOrderStatus(_bidID) == Orders.OrderStatus.ORDER_ACTIVE);
         require(ordersCrud.GetOrderCounterparty(_askID) == 0x0 || ordersCrud.GetOrderCounterparty(_askID) == ordersCrud.GetOrderAuthor(_bidID));
-        require(ordersCrud.GetOrderCounterparty(_bidID) == 0x0
+        require(
+            ordersCrud.GetOrderCounterparty(_bidID) == 0x0
             || ordersCrud.GetOrderCounterparty(_bidID) == administratum.GetMaster(ordersCrud.GetOrderAuthor(_askID))
             || ordersCrud.GetOrderCounterparty(_bidID) == ordersCrud.GetOrderAuthor(_askID));
         require(ordersCrud.GetOrderType(_askID) == Orders.OrderType.ORDER_ASK);

diff --git a/blockchain/source/contracts/Orders.sol b/blockchain/source/contracts/Orders.sol
@@ -1,9 +1,9 @@
 pragma solidity ^0.4.23;
 
-import "zeppelin-solidity/contracts/ownership/Ownable.sol";
+import "./Administratable.sol";
 import "./ProfileRegistry.sol";
 
-contract Orders is Ownable {
+contract Orders is Administratable {
     //events
 
     //enums
@@ -53,6 +53,7 @@ contract Orders is Ownable {
 
     constructor() public {
         owner = msg.sender;
+        administrator = msg.sender;
     }
 
     function Write(