Common cases

contracts/Deal.sol

@@ -1,38 +1,31 @@
-pragma solidity ^0.4.15;
-
-
-import '../node_modules/zeppelin-solidity/contracts/crowdsale/Crowdsale.sol';
-import './TxOwnable.sol';
-import './DealToken.sol';
-
-
-contract Deal is Crowdsale, TxOwnable {
-
-  DealToken dealToken;
-  mapping (address => bool) authorized;
-  event Authorizing(address sender, address investor);
-
-  function Deal(uint256 _startTime, uint256 _endTime, uint256 _rate, address _wallet)
-   Crowdsale(_startTime, _endTime, _rate, _wallet) TxOwnable {
-  }
-
-  // creates the token to be sold.
-  // override this method to have crowdsale of a specific MintableToken token.
-  function createTokenContract() internal returns (MintableToken) {
-//    address dealAddress = address(this);
-//    DealToken(dealAddress, address(token));
-    dealToken = new DealToken();
-    return dealToken;
-  }
-
-  function authorize(address investor) onlyOwner public {
-    Authorizing(msg.sender,investor);
-    dealToken.authorizeAddress(investor,true);
-    authorized[investor] = true;
-  }
-
-
-  function buyTokens(address beneficiary) public payable {
-    return super.buyTokens(beneficiary);
-  }
+pragma solidity ^0.4.19;
+
+import '../node_modules/validated-token/contracts/ReferenceToken.sol';
+
+contract Deal is ReferenceToken {
+    using SafeMath for uint256;
+
+    uint256 public startTime;
+    uint256 public endTime;
+    uint256 public holdPeriod;
+
+    function Deal(
+        string _name,
+        string _symbol,
+        uint256 _granularity,
+        uint256 _startTime,
+        uint256 _endTime,
+        uint256 _holdPeriod,
+        TokenValidator _validator
+    ) ReferenceToken(_name, _symbol, _granularity, _validator) public {
+        require(_startTime >= now);
+        require(_startTime < _endTime);
+
+        startTime  = _startTime;
+        endTime    = _endTime;
+    }
+
+    function endNow() public onlyOwner {
+        endTime = now;
+    }
 }

contracts/DealFactory.sol

@@ -1,17 +1,28 @@
-pragma solidity ^0.4.15;
-
+pragma solidity ^0.4.19;
 
 import './Deal.sol';
 
-
 contract DealFactory {
-  event DealCreated(address sender, address instance);
+    event DealCreated(address sender, Deal deal);
+    mapping(address => Deal[]) private registry;
+
+    function create(
+        string _name,
+        string _symbol,
+        uint256 _granularity,
+        uint256 _startTime,
+        uint256 _endTime,
+        uint256 _holdPeriod,
+        TokenValidator _validator
+    ) public returns (Deal _deal) {
+        Deal deal =
+          new Deal(_name, _symbol, _granularity, _startTime, _endTime, _holdPeriod, _validator);
+
+        registry[msg.sender].push(deal);
+        DealCreated(msg.sender, deal);
+
+        return deal;
+    }
 
-  mapping(address => address[]) public instantiations;
-  function createDeal(uint256 _startTime, uint256 _endTime, uint256 _rate, address _wallet) public returns (address deal) {
-    deal = new Deal(_startTime, _endTime, _rate, _wallet);
-    instantiations[msg.sender].push(deal);
-    DealCreated(msg.sender,deal);
-    return deal;
-  }
+    function mine() public view returns (Deal[]) { return registry[msg.sender]; }
 }

contracts/StaggeredDeal.sol

@@ -0,0 +1,53 @@
+pragma solidity ^0.4.19;
+
+import './Deal.sol';
+
+/** Staggered close
+
+       startTime     endTime                     dealOver
+          -tX           t0                           tZ
+           |============|============================|
+Prehistory |  Mintable  |         Tradeable          | Inactive
+           |============|============================|
+           |            |                            |
+           |            |                            |
+     Alice |   a ---------- a + holdPeriod           |
+           |  Mint   Hold   Trade                    |
+           |            |                            |
+           |            |                            |
+       Bob |     b ---------- b + holdPeriod         |
+           |    Mint   Hold   Trade                  |
+           |            |                            |
+           |            |                            |
+     Carol |        c ---------- c + holdPeriod      |
+           |       Mint | Hold   Trade               |
+           |            |                            |
+
+ */
+contract StaggeredDeal is Deal {
+    struct Minting {
+        uint256 amount;
+        uint256 createdAt;
+    }
+
+    mapping(address => Minting[]) public mintings;
+
+    /* function StaggeredDeal( */
+    /*     string _name, */
+    /*     string _symbol, */
+    /*     uint256 _granularity, */
+    /*     uint256 _startTime, */
+    /*     uint256 _endTime, */
+    /*     uint256 _holdPeriod, */
+    /*     TokenValidator _validator */
+    /* ) Deal(_name, _symbol, _granularity, _holdPeriod, _validator) public {} */
+
+    function mint(address _tokenHolder, uint256 _amount) public onlyOwner {
+        mintings[_tokenHolder].push(Minting({
+            amount: _amount,
+            createdAt: now
+        }));
+
+        super.mint(_tokenHolder, _amount);
+    }
+}

contracts/heirarchy.md

@@ -0,0 +1,24 @@
+# Heirarchy
+
+| Symbol        | Meaning       | Memonic |
+|---------------|---------------|---------|
+| `△`           | Inherits from | "is a"  |
+| `V`, `>`, `<` | Depends on    | "has a" |
+
+```
+TOKENS         FACTORIES             VALIDATORS
+
+  (EIP-902)
+ReferenceToken
+     △
+     | +----- DealFactory ----> TokenValidator
+     | |                             △    △
+     | |                             |    |
+     | |+------------------ DealValidator |
+     | ||                         |       |
+     | VV                         V       |
+     Deal <-------------------- PhaseValidator
+     △                                    △
+     |                                    |
+StaggeredDeal <------- StaggeredPhaseValidator
+```

contracts/validators/.#PhaseValidator.sol

@@ -0,0 +1 @@
+expede@Latte.hitronhub.home.54986

contracts/validators/DealValidator.sol

@@ -0,0 +1,77 @@
+pragma solidity ^0.4.19;
+
+import './PhaseValidator.sol';
+import './TokenValidator.sol';
+
+/* import '../Deal.sol'; */
+
+import '../../node_modules/zeppelin-solidity/contracts/ownership/Ownable.sol';
+
+/*
+   Deal          DealValidator        PhaseValidator
+    |                 |                    |
+    |    check/4      |                    |
+    +---------------> |                    |
+    |                 |     check/4        |
+    |                 +------------------> |
+    |                 |                    |
+    |                 |                    |
+    |                 |    startTime/0     |
+    | <------------------------------------+
+    |                 |    12345           |
+    +------------------------------------> |
+    |                 |                    |
+    |                 |                    |
+    |                 |      endTime/0     |
+    | <------------------------------------+
+    |                 |    67890           |
+    +------------------------------------> |
+    |                 |                    |
+    |                 |                    |
+    |                 |       hex"41"      |
+    |                 | <------------------+
+    |      hex"41"    |                    |
+    | <---------------+                    |
+    |                 |                    |
+    |                 |                    |
+ */
+contract DealValidator is Ownable, TokenValidator {
+    using SafeMath for uint256;
+
+    PhaseValidator private phaseValidator;
+    mapping(address => bool) private auths;
+
+    function DealValidator(PhaseValidator _phaseValidator) Ownable public {
+        phaseValidator = _phaseValidator;
+    }
+
+    function setAuth(address _address, bool _status) public onlyOwner {
+        auths[_address] = _status;
+    }
+
+    // TOKEN VALIDATOR //
+
+    function check(Deal _deal, address _account) public returns(byte _status) {
+        return auths[_account] ? phaseCheck(_deal, _account) : hex"10";
+    }
+
+    function check(
+        address /* _token */,
+        address _from,
+        address _to,
+        uint256 _amount
+    ) public returns (byte _validation) {
+        return (auths[_from] && auths[_to]) ? hex"11" : hex"10";
+    }
+
+    // HELPERS //
+
+    function phaseCheck(Deal _deal, address _tokenHolder) internal view returns (byte _validation) {
+        byte phaseState = phaseValidator.check(_deal, _tokenHolder);
+        return isOk(phaseState) ? hex"11" : phaseState;
+    }
+
+    function isOk(byte status) internal view returns (bool) {
+        return (status & hex"0F") == 1;
+    }
+}