Merge branch 'dev-3.0.0' into datastore

Author: adamdossa

.travis.yml

@@ -7,7 +7,7 @@ cache:
 jobs:
   include:
     - stage: Test
-      install: 
+      install:
         - echo -ne '\n' | sudo add-apt-repository ppa:ethereum/ethereum
         - sudo apt-get update
         - sudo apt-get install -y dpkg

0

@@ -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/ST20Generator.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/TickerRollForward.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
@@ -49,7 +49,7 @@ async function getGasLimit(options, action) {
 
 async function checkPermissions(action) {
   let contractRegistry = await connect(action._parent.options.jsonInterface, action._parent._address);
-  //NOTE this is a condition to verify if the transaction comes from a module or not. 
+  //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);
@@ -153,10 +153,13 @@ 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) {
-      allBatches.push(data.slice(index, index + batchSize));
+    for (let index = 0; index < data.length; index += parseInt(batchSize)) {
+      allBatches.push(data.slice(index, index + parseInt(batchSize)));
     }
     return allBatches;
   },

CLI/commands/common/common_functions.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/constants.js

@@ -60,46 +60,68 @@ function getPermissionList() {
         },
         ManualApprovalTransferManager: {
             addManualApproval: "TRANSFER_APPROVAL",
-            addManualBlocking: "TRANSFER_APPROVAL",
             revokeManualApproval: "TRANSFER_APPROVAL",
-            revokeManualBlocking: "TRANSFER_APPROVAL"
         },
         PercentageTransferManager: {
             modifyWhitelist: "WHITELIST",
             modifyWhitelistMulti: "WHITELIST",
             setAllowPrimaryIssuance: "ADMIN",
             changeHolderPercentage: "ADMIN"
         },
-        LockupVolumeRestrictionTM: {
-            addLockup: "ADMIN",
-            addLockUpMulti: "ADMIN",
-            removeLockUp: "ADMIN",
-            modifyLockUp: "ADMIN"
+        VolumeRestrictionTM: {
+            changeExemptWalletList: "ADMIN",
+            addIndividualRestriction: "ADMIN",
+            addIndividualRestrictionMulti: "ADMIN",
+            addGlobalRestriction: "ADMIN",
+            addDailyGlobalRestriction: "ADMIN",
+            removeIndividualRestriction: "ADMIN",
+            removeIndividualRestrictionMulti: "ADMIN",
+            removeGlobalRestriction: "ADMIN",
+            removeDailyGlobalRestriction: "ADMIN",
+            modifyIndividualRestriction: "ADMIN",
+            modifyIndividualRestrictionMulti: "ADMIN",
+            modifyGlobalRestriction: "ADMIN",
+            modifyDailyGlobalRestriction: "ADMIN"
         },
-        SingleTradeVolumeRestrictionTM: {
-            setAllowPrimaryIssuance: "ADMIN",
-            changeTransferLimitToPercentage: "ADMIN",
-            changeTransferLimitToTokens: "ADMIN",
-            changeGlobalLimitInTokens: "ADMIN",
-            changeGlobalLimitInPercentage: "ADMIN",
-            addExemptWallet: "ADMIN",
-            removeExemptWallet: "ADMIN",
-            addExemptWalletMulti: "ADMIN",
-            removeExemptWalletMulti: "ADMIN",
-            setTransferLimitInTokens: "ADMIN",
-            setTransferLimitInPercentage: "ADMIN",
-            removeTransferLimitInPercentage: "ADMIN",
-            removeTransferLimitInTokens: "ADMIN",
-            setTransferLimitInTokensMulti: "ADMIN",
-            setTransferLimitInPercentageMulti: "ADMIN",
-            removeTransferLimitInTokensMulti: "ADMIN",
-            removeTransferLimitInPercentageMulti: "ADMIN"
+        BlacklistTransferManager: {
+            addBlacklistType: "ADMIN",
+            addBlacklistTypeMulti: "ADMIN",
+            modifyBlacklistType: "ADMIN",
+            modifyBlacklistTypeMulti: "ADMIN",
+            deleteBlacklistType: "ADMIN",
+            deleteBlacklistTypeMulti: "ADMIN",
+            addInvestorToBlacklist: "ADMIN",
+            addInvestorToBlacklistMulti: "ADMIN",
+            addMultiInvestorToBlacklistMulti: "ADMIN",
+            addInvestorToNewBlacklist: "ADMIN",
+            deleteInvestorFromAllBlacklist: "ADMIN",
+            deleteInvestorFromAllBlacklistMulti: "ADMIN",
+            deleteInvestorFromBlacklist: "ADMIN",
+            deleteMultiInvestorsFromBlacklistMulti: "ADMIN",
+        },
+        VestingEscrowWallet: {
+            changeTreasuryWallet: "ONLY_OWNER",
+            depositTokens: "ADMIN",
+            sendToTreasury: "ADMIN",
+            pushAvailableTokens: "ADMIN",
+            addTemplate: "ADMIN",
+            removeTemplate: "ADMIN",
+            addSchedule: "ADMIN",
+            addScheduleFromTemplate: "ADMIN",
+            modifySchedule: "ADMIN",
+            revokeSchedule: "ADMIN",
+            revokeAllSchedules: "ADMIN",
+            pushAvailableTokensMulti: "ADMIN",
+            addScheduleMulti: "ADMIN",
+            addScheduleFromTemplateMulti: "ADMIN",
+            revokeSchedulesMulti: "ADMIN",
+            modifyScheduleMulti: "ADMIN"
         }
     }
 }
 
 module.exports = {
-    verifyPermission: function(contractName, functionName) {
+    verifyPermission: function (contractName, functionName) {
         let list = getPermissionList();
         try {
             return list[contractName][functionName]