Merge branch 'dev-2.1.0' into Vesting-Escrow-Wallet

Author: VictorVicente

.circleci/config.yml

@@ -0,0 +1,100 @@
+version: 2
+jobs:
+  build:
+    docker:
+      - image: circleci/node:8
+    steps:
+      - checkout
+      - restore_cache:
+          key: dependency-cache-{{ checksum "package.json" }}
+      - run: yarn install
+      - run: sudo npm i truffle -g
+      - run: node --version
+      - run: truffle version
+      - run: truffle compile
+      - save_cache:
+          key: dependency-cache-{{ checksum "package.json" }}
+          paths:
+            - node_modules
+  test:
+    docker:
+      - image: circleci/node:8
+    parallelism: 2
+    steps:
+      - checkout
+      - restore_cache:
+          key: dependency-cache-{{ checksum "package.json" }}
+      - run: yarn install
+      - run: sudo npm i truffle -g
+      - run: node --version
+      - run: truffle version
+      - run: npm run test
+      - save_cache:
+          key: dependency-cache-{{ checksum "package.json" }}
+          paths:
+            - node_modules
+      - store_test_results:
+          path: test-results
+      - store_artifacts:
+          path: ./test-results/mocha/results.xml
+  coverage:
+    docker:
+      - image: circleci/node:8
+    steps:
+      - checkout
+      - restore_cache:
+          key: dependency-cache-{{ checksum "package.json" }}
+      - run: yarn install
+      - run: sudo npm i truffle -g
+      - run: node --version
+      - run: truffle version
+      - run: 
+          command: npm run coverage
+          no_output_timeout: 1h
+      - save_cache:
+          key: dependency-cache-{{ checksum "package.json" }}
+          paths:
+            - node_modules
+      - store_artifacts:
+          path: ./coverage/lcov.info
+  docs:
+    docker:
+      - image: circleci/node:8
+    steps:
+      - checkout
+      - restore_cache:
+          key: dependency-cache-{{ checksum "package.json" }}
+      - run: yarn install
+      - run: sudo npm i truffle -g
+      - run: node --version
+      - run: truffle version
+      - run: npm run docs
+      - save_cache:
+          key: dependency-cache-{{ checksum "package.json" }}
+          paths:
+            - node_modules
+workflows:
+  version: 2
+  commit:
+    jobs:
+      - coverage
+  daily-builds:
+    triggers:
+      - schedule:
+          cron: "0 0 * * *"
+          filters:
+            branches:
+              only:
+                - master
+                - dev-2.1.0
+                - dev-2.2.0
+                - dev-3.0.0
+    jobs:
+      - coverage
+  docs:
+    jobs:
+      - docs:
+          filters:
+            branches:
+              only:
+                - master

.gitignore

@@ -22,4 +22,5 @@ bridge.log
 allFiredEvents
 extract/
 extract.py
-extract.zip
+extract.zip
+/test-results

.travis.yml

@@ -4,24 +4,11 @@ node_js:
 cache:
   directories:
   - node_modules
-matrix:
-  fast_finish: true
-  allow_failures:
-    - env: 'TASK=docs'
 jobs:
   include:
-    - stage: Tests and Coverage
-      after_install: wget -O node_modules/solidity-coverage/lib/app.js https://raw.githubusercontent.com/maxsam4/solidity-coverage/relative-path/lib/app.js
+    - stage: test
       before_script: truffle version
       script: npm run test
-    - stage: Docs
-      env: 'TASK=docs'
-      before_install: 
-        - echo -ne '\n' | sudo apt-add-repository -y ppa:hvr/z3
-        - sudo apt-get -y update
-        - sudo apt-get -y install libz3-dev 
-      before_script: wget -O node_modules/solidity-docgen/lib/index.js https://raw.githubusercontent.com/maxsam4/solidity-docgen/buffer-size/lib/index.js
-      script: npm run docs
 notifications:
   slack:
     secure: W4FZSabLrzF74f317hutolEHnlq2GBlQxU6b85L5XymrjgLEhlgE16c5Qz7Emoyt6le6PXL+sfG2ujJc3XYys/6hppgrHSAasuJnKCdQNpmMZ9BNyMs6WGkmB3enIf3K/FLXb26AQdwpQdIXuOeJUTf879u+YoiZV0eZH8d3+fsIOyovq9N6X5pKOpDM9iT8gGB4t7fie7xf51s+iUaHxyO9G7jDginZ4rBXHcU7mxCub9z+Z1H8+kCTnPWaF+KKVEXx4Z0nI3+urboD7E4OIP02LwrThQls2CppA3X0EoesTcdvj/HLErY/JvsXIFiFEEHZzB1Wi+k2TiOeLcYwEuHIVij+HPxxlJNX/j8uy01Uk8s4rd+0EhvfdKHJqUKqxH4YN2npcKfHEss7bU3y7dUinXQfYShW5ZewHdvc7pnnxBTfhvmdi64HdNrXAPq+s1rhciH7MmnU+tsm4lhrpr+FBuHzUMA9fOCr7b0SQytZEgWpiUls88gdbh3yG8TjyZxmZJGx09cwEP0q7VoH0UwFh7mIu5XmYdd5tWUhavTiO7YV8cUPn7MvwMsTltB3YBpF/fB26L7ka8zBhCsjm9prW6SVYU/dyO3m91VeZtO/zJFHRDA6Q58JGVW2rgzO39z193qC1EGRXqTie96VwAAtNg8+hRb+bI/CWDVzSPc=

CHANGELOG.md

@@ -5,11 +5,14 @@ All notable changes to this project will be documented in this file.
 
 [__2.1.0__](https://www.npmjs.com/package/polymath-core?activeTab=readme) __13-09-18__
 
-## CappedSTO 2.0.1
+
+## CappedSTO 2.1.0
 * `rate` is now accepted as multiplied by 10^18 to allow settting higher price than 1ETH/POLY per token.
 * Indivisble tokens are now supported. When trying to buy partial tokens, allowed full units of tokens will be purchased and remaining funds will be returned.
 
 ## USDTieredSTO 2.1.0
+* Added `stableCoinsRaised` function that returns amount of individual stable coin raised when address of that stable coin is passed.
+* Added support for multiple stable coins in USDTSTO.
 * Added `buyTokensView` and `getTokensMintedByTier` to USDTSTO.
 * Added `getSTODetails` to USDTSTO.
 * Added an Array of Tiers that will hold data about every tier in USDTSTO.
@@ -31,6 +34,10 @@ All notable changes to this project will be documented in this file.
 * Removed `0x0` check for the `_from` address to `ManualApprovalTransferManager`. This allows for the Issuer/Transfer Agent to approve a one-off mint of tokens that otherwise would not be possible. 
 * Changed the version of `ManualApprovalTransferManagerFactory` from `1.0.0` to `2.1.0`.   
 * Deployed 2.0.1 `ManualApprovalTransferManagerFactory` to address 0x6af2afad53cb334e62b90ddbdcf3a086f654c298
+* Add `getActiveApprovalsToUser()` function to access all the active approvals for a user whether user is in the `from` or in `to`.  
+* Add `getApprovalDetails()` to get the details of the approval corresponds to `_from` and `_to` address.
+* Add feature to modify the details of the active approval using `modifyApproval()` & `modifyApprovalMulti()`.
+* Add `addManualApprovalMulti()` and `revokeManualApprovalMulti()` batch function for adding and revoking the manual approval respectively.
 
 ## Dividends
 * Changed the version of `ERC20DividendCheckpointFactory` & `EtherDividendCheckpointFactory` from `1.0.0` to `2.1.0`.

CLI/commands/ST20Generator.js

@@ -32,7 +32,9 @@ async function executeApp(_ticker, _transferOwnership, _name, _details, _divisib
       await step_transfer_ticker_ownership(_transferOwnership);
       await step_token_deploy(_name, _details, _divisible);
     }
-    await tokenManager.executeApp(tokenSymbol);
+    if (typeof _divisible === 'undefined') {
+      await tokenManager.executeApp(tokenSymbol);
+    }
   } catch (err) {
     console.log(err);
     return;

CLI/commands/TickerRollForward.js

@@ -20,9 +20,9 @@ let securityTokenRegistry;
 let securityTokenRegistryAddress;
 
 function Ticker(_owner, _symbol, _name) {
-    this.owner = _owner;
-    this.symbol = _symbol;
-    this.name = _name;
+  this.owner = _owner;
+  this.symbol = _symbol;
+  this.name = _name;
 }
 
 function FailedRegistration(_ticker, _error) {
@@ -58,11 +58,11 @@ async function startScript() {
 }
 
 async function readFile() {
-  var stream = fs.createReadStream("./CLI/data/ticker_data.csv");
+  var stream = fs.createReadStream(`${__dirname}/../data/ticker_data.csv`);
 
   var csvStream = csv()
     .on("data", function (data) {
-      ticker_data.push(new Ticker(data[0],data[1],data[2],data[3]));
+      ticker_data.push(new Ticker(data[0], data[1], data[2], data[3]));
     })
     .on("end", async function () {
       await registerTickers();
@@ -73,12 +73,12 @@ async function readFile() {
 async function registerTickers() {
   // Poly approval for registration fees
   let polyBalance = BigNumber(await polyToken.methods.balanceOf(Issuer.address).call());
-  let fee = web3.utils.fromWei(await securityTokenRegistry.methods.getTickerRegistrationFee().call());  
+  let fee = web3.utils.fromWei(await securityTokenRegistry.methods.getTickerRegistrationFee().call());
   let totalFee = BigNumber(ticker_data.length).mul(fee);
 
   if (totalFee.gt(polyBalance)) {
     console.log(chalk.red(`\n*******************************************************************************`));
-    console.log(chalk.red(`Not enough POLY to pay registration fee. Require ${totalFee.div(10**18).toNumber()} POLY but have ${polyBalance.div(10**18).toNumber()} POLY.`));
+    console.log(chalk.red(`Not enough POLY to pay registration fee. Require ${totalFee.div(10 ** 18).toNumber()} POLY but have ${polyBalance.div(10 ** 18).toNumber()} POLY.`));
     console.log(chalk.red(`*******************************************************************************\n`));
     process.exit(0);
   } else {
@@ -100,7 +100,7 @@ async function registerTickers() {
     }
 
     // validate ticker
-    await securityTokenRegistry.methods.getTickerDetails(ticker_data[i].symbol).call({}, function(error, result){
+    await securityTokenRegistry.methods.getTickerDetails(ticker_data[i].symbol).call({}, function (error, result) {
       if (result[1] != 0) {
         failed_tickers.push(` ${i} is already registered`);
         valid = false;
@@ -131,7 +131,7 @@ async function logResults() {
     Successful registrations: ${registered_tickers.length}
     Failed registrations:     ${failed_tickers.length}
     Total gas consumed:       ${totalGas}
-    Total gas cost:           ${defaultGasPrice.mul(totalGas).div(10**18)} ETH
+    Total gas cost:           ${defaultGasPrice.mul(totalGas).div(10 ** 18)} ETH
 
     List of failed registrations:
     ${failed_tickers}

CLI/commands/common/common_functions.js

@@ -3,7 +3,7 @@ const Tx = require('ethereumjs-tx');
 const permissionsList = require('./permissions_list');
 const abis = require('../helpers/contract_abis');
 
-async function connect(abi, address) {
+function connect(abi, address) {
   contractRegistry = new web3.eth.Contract(abi, address);
   contractRegistry.setProvider(web3.currentProvider);
   return contractRegistry
@@ -15,7 +15,7 @@ async function checkPermission(contractName, functionName, contractRegistry) {
     return true
   } else {
     let stAddress = await contractRegistry.methods.securityToken().call();
-    let securityToken = await connect(abis.securityToken(), stAddress);
+    let securityToken = connect(abis.securityToken(), stAddress);
     let stOwner = await securityToken.methods.owner().call();
     if (stOwner == Issuer.address) {
       return true
@@ -48,11 +48,11 @@ async function getGasLimit(options, action) {
 }
 
 async function checkPermissions(action) {
-  let contractRegistry = await connect(action._parent.options.jsonInterface, action._parent._address);
+  let contractRegistry = connect(action._parent.options.jsonInterface, action._parent._address);
   //NOTE this is a condition to verify if the transaction comes from a module or not. 
   if (contractRegistry.methods.hasOwnProperty('factory')) {
     let moduleAddress = await contractRegistry.methods.factory().call();
-    let moduleRegistry = await connect(abis.moduleFactory(), moduleAddress);
+    let moduleRegistry = connect(abis.moduleFactory(), moduleAddress);
     let parentModule = await moduleRegistry.methods.getName().call();
     let result = await checkPermission(web3.utils.hexToUtf8(parentModule), action._method.name, contractRegistry);
     if (!result) {
@@ -153,6 +153,9 @@ module.exports = {
     let filteredLogs = logs.filter(l => l.topics.includes(eventJsonInterface.signature));
     return filteredLogs.map(l => web3.eth.abi.decodeLog(eventJsonInterface.inputs, l.data, l.topics.slice(1)));
   },
+  connect: function (abi, address) {
+    return connect(abi, address)
+  },
   splitIntoBatches: function (data, batchSize) {
     let allBatches = [];
     for (let index = 0; index < data.length; index += batchSize) {

CLI/commands/common/constants.js

@@ -29,7 +29,7 @@ module.exports = Object.freeze({
     FUND_RAISE_TYPES: {
         ETH: 0,
         POLY: 1,
-        DAI: 2
+        STABLE: 2
     },
     DEFAULT_BATCH_SIZE: 75,
     ADDRESS_ZERO: '0x0000000000000000000000000000000000000000'

CLI/commands/common/global.js

@@ -44,9 +44,9 @@ module.exports = {
           console.log("Invalid remote node")
           process.exit(0)
         }
-        await httpProvider(remoteNetwork, './privKey');
+        await httpProvider(remoteNetwork, `${__dirname}/../../../privKey`);
       } else {
-        await httpProvider("http://localhost:8545", './privKeyLocal');
+        await httpProvider("http://localhost:8545", `${__dirname}/../../../privKeyLocal`);
       }
       defaultGasPrice = getGasPrice(await web3.eth.net.getId());
     }

CLI/commands/common/permissions_list.js

@@ -60,9 +60,7 @@ function getPermissionList() {
         },
         ManualApprovalTransferManager: {
             addManualApproval: "TRANSFER_APPROVAL",
-            addManualBlocking: "TRANSFER_APPROVAL",
             revokeManualApproval: "TRANSFER_APPROVAL",
-            revokeManualBlocking: "TRANSFER_APPROVAL"
         },
         PercentageTransferManager: {
             modifyWhitelist: "WHITELIST",
@@ -99,7 +97,7 @@ function getPermissionList() {
 }
 
 module.exports = {
-    verifyPermission: function(contractName, functionName) {
+    verifyPermission: function (contractName, functionName) {
         let list = getPermissionList();
         try {
             return list[contractName][functionName]