merge subcribe functions into new master

Author: davekay100

.travis.yml

@@ -1,28 +1,3 @@
-##language: node_js
-##node_js:
-##  - '8'
-#install:
-#  - npm install
-#env:
-#  - CI="true"
-#cache:
-#  directories:
-#    - "node_modules"
-#script:
-#- npm run ci
-#notifications:
-#  slack:
-#    template:
-#      - "%{repository} (%{commit}) : %{message}"
-#      - "Build details: %{build_url}"
-#    secure: fbW2WBx95rA3G/gubh4olbaCMcvK0YNnp3cSbLOAuvrdAt710jvPGLrLFmBphAuzKgkvl5hfpid/iUgpXGt494+VHx6oDHMMN6WX7BfQm0hI2x4hyzsFd0FXCfk1valXjNgkEC6+cbhbEPYPMVqaiPEpowbq96pjUoj+6y/gGEY/kh/kEfnMxgQLzI+ExQifx8j1EFtlIjoODS7N8qx5+N4XqHzuQy9QJ0xwFrcg4MLukZcaTkGM2B+XSMCl22qh5PId9TJVWN5rpKZpmOEVdEOOqVigp0/oYdrBCeM/qXtCIryFLWJcQBKJfWRJAAWBPt3iR6RX14DJJACDG/dI2Jc4GLUfVgLPwn1lBMwXuas9GzlPYd1WkCRjnilYzRmNmxa2yYylJvfZBQ7c6b/J2UbRZIAZxLd8+LEqqu0PkAq/HYowFUvxG5yaTlOgMDC/pKNcKHtRAFb35AYjtSJ/1T9ktRtuf2fckR4c2usXeDNxMDp0yhCTjgmS1axxCyOTBELM4qJEYQYyOKt4Sd8TB1AH+2if9XRgvpwZU6BnWhI6LME/m9ci6Yf49QBCIts51kYejyGizUylFBkGDSEjuj3tt16a6QIU/l90DOIlQxYKI58uf5d2OnP8t695fO0clSd+DLGJRXInD2d3Ir0jge69br/njql4NUvFPK6kVBs=
-#  email: false
-#  on_success: always
-#branches:
-#  only:
-#  - master
-
-
 install:
   - yarn install
 env:
@@ -42,4 +17,6 @@ before_script:
 - sleep 1
 
 script:
+- yarn compile
+- yarn migrate-testrpc
 - yarn ci

README.md

@@ -1,5 +1,4 @@
 [![Build Status](https://travis-ci.org/PolymathNetwork/polymath.js.svg?branch=master)](https://travis-ci.org/PolymathNetwork/polymath.js)
-
 <a href="https://t.me/polymathnetwork"><img src="https://img.shields.io/badge/50k+-telegram-blue.svg" target="_blank"></a>
 
 <!--img src="https://img.shields.io/badge/bounties-1,000,000-green.svg" href="/issues-->

contracts/Compliance.sol

@@ -48,19 +48,21 @@ contract Compliance is ICompliance {
 
     Customers public PolyCustomers;                                      // Instance of the Compliance contract
     uint256 public constant MINIMUM_VESTING_PERIOD = 60 * 60 * 24 * 100; // 100 Day minimum vesting period for POLY earned
-   
+
     // Notifications
     event LogTemplateCreated(address indexed _creator, address _template, string _offeringType);
-    event LogNewTemplateProposal(address indexed _securityToken, address _template, address _delegate);
-    event LogNewContractProposal(address indexed _securityToken, address _offeringContract, address _delegate);
+    event LogNewTemplateProposal(address indexed _securityToken, address _template, address _delegate, uint _templateProposalIndex);
+    event LogCancelTemplateProposal(address indexed _securityToken, address _template, uint _templateProposalIndex);
+    event LogNewContractProposal(address indexed _securityToken, address _offeringContract, address _delegate, uint _offeringProposalIndex);
+    event LogCancelContractProposal(address indexed _securityToken, address _offeringContract, uint _offeringProposalIndex);
 
     /* @param _polyCustomersAddress The address of the Polymath Customers contract */
     function Compliance(address _polyCustomersAddress) public {
         PolyCustomers = Customers(_polyCustomersAddress);
     }
 
     /**
-     * @dev `setRegsitrarAddress` This function set the SecurityTokenRegistrar contract address. 
+     * @dev `setRegsitrarAddress` This function set the SecurityTokenRegistrar contract address.
      * @param _STRegistrar It is the `this` reference of STR contract
      * @return bool
      */
@@ -69,7 +71,7 @@ contract Compliance is ICompliance {
         require(STRegistrar == address(0));
         STRegistrar = SecurityTokenRegistrar(_STRegistrar);
         return true;
-    } 
+    }
 
     /**
      * @dev `createTemplate` is a simple function to create a new compliance template
@@ -132,7 +134,7 @@ contract Compliance is ICompliance {
     {
         // Verifying that provided _securityToken is generated by securityTokenRegistrar only
         var (totalSupply, owner,,) = STRegistrar.getSecurityTokenData(_securityToken);
-        require(totalSupply > 0 && owner != address(0)); 
+        require(totalSupply > 0 && owner != address(0));
         // Require that template has not expired, that the caller is the
         // owner of the template and that the template has been finalized
         require(templates[_template].expires > now);
@@ -144,7 +146,7 @@ contract Compliance is ICompliance {
 
         //Get a reference of the template contract and add it to the templateProposals array
         templateProposals[_securityToken].push(_template);
-        LogNewTemplateProposal(_securityToken, _template, msg.sender);
+        LogNewTemplateProposal(_securityToken, _template, msg.sender,templateProposals[_securityToken].length -1);
         return true;
     }
 
@@ -164,6 +166,8 @@ contract Compliance is ICompliance {
         var (chosenTemplate,,,,) = ISecurityToken(_securityToken).getTokenDetails();
         require(chosenTemplate != proposedTemplate);
         templateProposals[_securityToken][_templateProposalIndex] = address(0);
+        LogCancelTemplateProposal(_securityToken, proposedTemplate, _templateProposalIndex);
+
         return true;
     }
 
@@ -206,15 +210,15 @@ contract Compliance is ICompliance {
     {
         // Verifying that provided _securityToken is generated by securityTokenRegistrar only
         var (totalSupply, owner,,) = STRegistrar.getSecurityTokenData(_securityToken);
-        require(totalSupply > 0 && owner != address(0));  
+        require(totalSupply > 0 && owner != address(0));
 
         var (,,,,KYC) = ISecurityToken(_securityToken).getTokenDetails();
         var (,,, verified, expires) = PolyCustomers.getCustomer(KYC, offerings[_stoContract].auditor);
         require(offerings[_stoContract].auditor == msg.sender);
         require(verified);
         require(expires > now);
         offeringProposals[_securityToken].push(_stoContract);
-        LogNewContractProposal(_securityToken, _stoContract, msg.sender);
+        LogNewContractProposal(_securityToken, _stoContract, msg.sender,offeringProposals[_securityToken].length -1);
         return true;
     }
 
@@ -234,6 +238,8 @@ contract Compliance is ICompliance {
         var (,,,,chosenOffering) = ISecurityToken(_securityToken).getTokenDetails();
         require(chosenOffering != proposedOffering);
         offeringProposals[_securityToken][_offeringProposalIndex] = address(0);
+        LogCancelContractProposal(_securityToken, proposedOffering, _offeringProposalIndex);
+
         return true;
     }
 
@@ -273,6 +279,15 @@ contract Compliance is ICompliance {
         return templateProposals[_securityTokenAddress][_templateIndex];
     }
 
+    /**
+     * @dev Get an array containing the address of all template proposals for a given ST
+     * @param _securityTokenAddress The security token ethereum address
+     * @return Template proposals array
+     */
+    function getAllTemplateProposals(address _securityTokenAddress) view public returns (address[]){
+        return templateProposals[_securityTokenAddress];
+    }
+
     /**
      * @dev Get security token offering smart contract details by the proposal index
      * @param _securityTokenAddress The security token ethereum address
@@ -296,4 +311,13 @@ contract Compliance is ICompliance {
         );
     }
 
+    /**
+     * @dev Get an array containing the address of all offering proposals for a given ST
+     * @param _securityTokenAddress The security token ethereum address
+     * @return Offering proposals array
+     */
+    function getAllOfferingProposals(address _securityTokenAddress) view public returns (address[]){
+        return offeringProposals[_securityTokenAddress];
+    }
+
 }

contracts/Customers.sol

@@ -7,7 +7,7 @@ pragma solidity ^0.4.18;
   tokens based on their verifications by providers.
 */
 
-import './PolyToken.sol';
+import './interfaces/IERC20.sol';
 import './interfaces/ICustomers.sol';
 
 /**
@@ -19,7 +19,7 @@ contract Customers is ICustomers {
 
     string public VERSION = "1";
 
-    PolyToken POLY;                                                     // Instance of the POLY token
+    IERC20 POLY;                                                        // Instance of the POLY token
 
     struct Customer {                                                   // Structure use to store the details of the customers
         bytes32 countryJurisdiction;                                    // Customers country jurisdiction as ex - ISO3166
@@ -57,7 +57,7 @@ contract Customers is ICustomers {
      * @dev Constructor
      */
     function Customers(address _polyTokenAddress) public {
-        POLY = PolyToken(_polyTokenAddress);
+        POLY = IERC20(_polyTokenAddress);
     }
 
     /**

contracts/Ownable.sol

@@ -1,14 +1,14 @@
 pragma solidity ^0.4.18;
 
+import './SafeMath.sol';
+import './interfaces/IERC20.sol';
+
 /*
  POLY token faucet is only used on testnet for testing purposes
  !!!! NOT INTENDED TO BE USED ON MAINNET !!!
 */
 
-import './SafeMath.sol';
-import './interfaces/IERC20.sol';
-
-contract PolyToken is IERC20 {
+contract PolyTokenMock is IERC20 {
 
     using SafeMath for uint256;
     uint256 public totalSupply = 1000000;
@@ -33,7 +33,7 @@ contract PolyToken is IERC20 {
      * @dev send `_value` token to `_to` from `msg.sender`
      * @param _to The address of the recipient
      * @param _value The amount of token to be transferred
-     * @return Whether the transfer was successful or not 
+     * @return Whether the transfer was successful or not
      */
     function transfer(address _to, uint256 _value) public returns (bool) {
         balances[msg.sender] = balances[msg.sender].sub(_value);
@@ -42,12 +42,12 @@ contract PolyToken is IERC20 {
         return true;
     }
 
-    /** 
+    /**
      * @dev send `_value` token to `_to` from `_from` on the condition it is approved by `_from`
      * @param _from The address of the sender
      * @param _to The address of the recipient
      * @param _value The amount of token to be transferred
-     * @return Whether the transfer was successful or not 
+     * @return Whether the transfer was successful or not
      */
     function transferFrom(address _from, address _to, uint256 _value) public returns (bool) {
       require(_to != address(0));
@@ -64,31 +64,32 @@ contract PolyToken is IERC20 {
     /**
      * @dev `balanceOf` function to get the balance of token holders
      * @param _owner The address from which the balance will be retrieved
-     * @return The balance 
+     * @return The balance
      */
     function balanceOf(address _owner) public view returns (uint256 balance) {
         return balances[_owner];
     }
 
-    /** 
+    /**
      * @dev `msg.sender` approves `_spender` to spend `_value` tokens
      * @param _spender The address of the account able to transfer the tokens
      * @param _value The amount of tokens to be approved for transfer
-     * @return Whether the approval was successful or not 
+     * @return Whether the approval was successful or not
      */
     function approve(address _spender, uint256 _value) public returns (bool) {
         allowed[msg.sender][_spender] = _value;
         Approval(msg.sender, _spender, _value);
         return true;
     }
 
-    /** 
+    /**
      * @param _owner The address of the account owning tokens
      * @param _spender The address of the account able to transfer the tokens
-     * @return Amount of remaining tokens allowed to spent 
+     * @return Amount of remaining tokens allowed to spent
      */
     function allowance(address _owner, address _spender) public view returns (uint256 remaining) {
         return allowed[_owner][_spender];
     }
 
 }
+

contracts/PolyToken.sol renamed to contracts/PolyTokenMock.sol

@@ -7,7 +7,7 @@ pragma solidity ^0.4.18;
 */
 
 import './interfaces/ISTRegistrar.sol';
-import './PolyToken.sol';
+import './interfaces/IERC20.sol';
 import './SecurityToken.sol';
 import './Compliance.sol';
 
@@ -36,7 +36,6 @@ contract SecurityTokenRegistrar is ISTRegistrar {
     mapping(string => address) tickers;                             // Mapping of ticker name to Security Token
 
     event LogNewSecurityToken(string ticker, address securityTokenAddress, address owner, address host, uint256 fee, uint8 _type);
-    event LogSecurityToken(address securityToken);
     /**
      * @dev Constructor use to set the essentials addresses to facilitate
      * the creation of the security token
@@ -89,7 +88,7 @@ contract SecurityTokenRegistrar is ISTRegistrar {
       require(_lockupPeriod >= now);
       require(_owner != address(0) && _host != address(0));
       require(bytes(_name).length > 0 && bytes(_ticker).length > 0);
-      PolyToken POLY = PolyToken(polyTokenAddress);
+      IERC20 POLY = IERC20(polyTokenAddress);
       POLY.transferFrom(msg.sender, _host, _fee);
       address newSecurityTokenAddress = initialiseSecurityToken(_name, _ticker, _totalSupply, _decimals, _owner, _maxPoly, _type, _lockupPeriod, _quorum);
       LogNewSecurityToken(_ticker, newSecurityTokenAddress, _owner, _host, _fee, _type);

contracts/SecurityTokenRegistrar.sol

@@ -1,9 +1,8 @@
-const PolyToken = artifacts.require('./PolyToken.sol');
 const Compliance = artifacts.require('./Compliance.sol');
 const Customers = artifacts.require('./Customers.sol');
-const SecurityTokenRegistrar = artifacts.require(
-  './SecurityTokenRegistrar.sol'
-);
+const SecurityTokenRegistrar = artifacts.require('./SecurityTokenRegistrar.sol');
+
+const PolyToken = artifacts.require('./PolyTokenMock.sol');;
 
 module.exports = (deployer, network) => {
   console.log(`Deploying Polymath Network Smart contracts to ${network}...`);