VolumeRestrictionTM

.travis.yml

@@ -8,7 +8,7 @@ jobs:
   include:
     - stage: test
       before_script: truffle version
-      script: npm run test
+      script: travis_wait 120 sleep infinity & npm run test
 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

@@ -43,6 +43,13 @@ All notable changes to this project will be documented in this file.
 * Changed the version of `ERC20DividendCheckpointFactory` & `EtherDividendCheckpointFactory` from `1.0.0` to `2.1.0`.
 * Applied proxy pattern to Dividends modules
 
+## Experimental modules
+* Remove the `SingleTradeVolumeRestrictionTMFactory.sol` and its corresponding module `SingleTradeVolumeRestrictionTM.sol`.
+
+## Added
+* Add new module called `VolumeRestrictionTM.sol` under the TransferManager modules list. It will be used to restrict the token
+volume traded in a given rolling period.
+
 ## Changed
 * `getAllModulesAndPermsFromTypes()` does not take securityToken address as a parameter anymore.
 

CLI/commands/helpers/contract_abis.js

@@ -10,6 +10,7 @@ let generalTransferManagerABI;
 let manualApprovalTransferManagerABI;
 let countTransferManagerABI;
 let percentageTransferManagerABI;
+let volumeRestrictionTMABI;
 let generalPermissionManagerABI;
 let polyTokenABI;
 let cappedSTOFactoryABI;
@@ -36,6 +37,7 @@ try {
     manualApprovalTransferManagerABI = JSON.parse(require('fs').readFileSync(`${__dirname}/../../../build/contracts/ManualApprovalTransferManager.json`).toString()).abi;
     countTransferManagerABI = JSON.parse(require('fs').readFileSync(`${__dirname}/../../../build/contracts/CountTransferManager.json`).toString()).abi;
     percentageTransferManagerABI = JSON.parse(require('fs').readFileSync(`${__dirname}/../../../build/contracts/PercentageTransferManager.json`).toString()).abi;
+    volumeRestrictionTMABI = JSON.parse(require('fs').readFileSync(`${__dirname}/../../../build/contracts/VolumeRestrictionTM.json`).toString()).abi;
     generalPermissionManagerABI = JSON.parse(require('fs').readFileSync(`${__dirname}/../../../build/contracts/GeneralPermissionManager.json`).toString()).abi;
     polyTokenABI = JSON.parse(require('fs').readFileSync(`${__dirname}/../../../build/contracts/PolyTokenFaucet.json`).toString()).abi;
     cappedSTOFactoryABI = JSON.parse(require('fs').readFileSync(`${__dirname}/../../../build/contracts/CappedSTOFactory.json`).toString()).abi;
@@ -90,6 +92,9 @@ module.exports = {
     percentageTransferManager: function () {
         return percentageTransferManagerABI;
     },
+    volumeRestrictionTM: function () {
+        return volumeRestrictionTMABI;
+    },
     generalPermissionManager: function () {
         return generalPermissionManagerABI;
     },

CLI/data/Transfer/VRTM/add_daily_restriction_data.csv

@@ -0,0 +1,8 @@
+0xee7ae74d964f2be7d72c1b187b38e2ed3615d4d1,1000,1/8/2019,10/10/2019,"Fixed"
+0x2f0fd672bf222413cc69dc1f4f1d7e93ad1763a1,2000,1/8/2019,10/10/2019,"Fixed"
+0xac297053173b02b02a737d47f7b4a718e5b170ef,500,1/8/2019,10/10/2019,"Fixed"
+0x49fc0b78238dab644698a90fa351b4c749e123d2,0.15,1/8/2019,10/10/2019,"Percentage"
+0x10223927009b8add0960359dd90d1449415b7ca9,0.25,1/8/2019,10/10/2019,"Percentage"
+0x3c65cfe3de848cf38e9d76e9c3e57a2f1140b399,0.1,1/8/2019,10/10/2019,"Percentage"
+0xabf60de3265b3017db7a1be66fc8b364ec1dbb98,1234,1/8/2019,10/10/2019,"Fixed"
+0xb841fe5a89da1bbef2d0805fbd7ffcbbb2fca5e3,5678,1/8/2019,10/10/2019,"Fixed"

CLI/data/Transfer/VRTM/add_restriction_data.csv

@@ -0,0 +1,8 @@
+0xee7ae74d964f2be7d72c1b187b38e2ed3615d4d1,1000,1/8/2019,90,10/10/2019,"Fixed"
+0x2f0fd672bf222413cc69dc1f4f1d7e93ad1763a1,2000,1/8/2019,30,10/10/2019,"Fixed"
+0xac297053173b02b02a737d47f7b4a718e5b170ef,500,1/8/2019,15,10/10/2019,"Fixed"
+0x49fc0b78238dab644698a90fa351b4c749e123d2,0.15,1/8/2019,90,10/10/2019,"Percentage"
+0x10223927009b8add0960359dd90d1449415b7ca9,0.25,1/8/2019,30,10/10/2019,"Percentage"
+0x3c65cfe3de848cf38e9d76e9c3e57a2f1140b399,0.1,1/8/2019,15,10/10/2019,"Percentage"
+0xabf60de3265b3017db7a1be66fc8b364ec1dbb98,1234,1/8/2019,10,10/10/2019,"Fixed"
+0xb841fe5a89da1bbef2d0805fbd7ffcbbb2fca5e3,5678,1/8/2019,2,10/10/2019,"Fixed"

CLI/data/Transfer/VRTM/modify_daily_restriction_data.csv

@@ -0,0 +1,5 @@
+0xee7ae74d964f2be7d72c1b187b38e2ed3615d4d1,2000,1/8/2019,10/10/2019,"Fixed"
+0x2f0fd672bf222413cc69dc1f4f1d7e93ad1763a1,2000,2/8/2019,10/10/2019,"Fixed"
+0xac297053173b02b02a737d47f7b4a718e5b170ef,500,1/8/2019,10/10/2019,"Fixed"
+0x49fc0b78238dab644698a90fa351b4c749e123d2,0.15,1/8/2019,20/10/2019,"Percentage"
+0x10223927009b8add0960359dd90d1449415b7ca9,25,1/8/2019,10/10/2019,"Fixed"

CLI/data/Transfer/VRTM/modify_restriction_data.csv

@@ -0,0 +1,5 @@
+0xee7ae74d964f2be7d72c1b187b38e2ed3615d4d1,2000,1/8/2019,90,10/10/2019,"Fixed"
+0x2f0fd672bf222413cc69dc1f4f1d7e93ad1763a1,2000,2/8/2019,30,10/10/2019,"Fixed"
+0xac297053173b02b02a737d47f7b4a718e5b170ef,500,1/8/2019,20,10/10/2019,"Fixed"
+0x49fc0b78238dab644698a90fa351b4c749e123d2,0.15,1/8/2019,90,20/10/2019,"Percentage"
+0x10223927009b8add0960359dd90d1449415b7ca9,25,1/8/2019,30,10/10/2019,"Fixed"

CLI/data/Transfer/VRTM/remove_daily_restriction_data.csv

@@ -0,0 +1,6 @@
+0xee7ae74d964f2be7d72c1b187b38e2ed3615d4d1
+0x2f0fd672bf222413cc69dc1f4f1d7e93ad1763a1
+0xac297053173b02b02a737d47f7b4a718e5b170ef
+0x49fc0b78238dab644698a90fa351b4c749e123d2
+0x10223927009b8add0960359dd90d1449415b7ca9
+0x3c65cfe3de848cf38e9d76e9c3e57a2f1140b399

CLI/data/Transfer/VRTM/remove_restriction_data.csv

@@ -0,0 +1,2 @@
+0xabf60de3265b3017db7a1be66fc8b364ec1dbb98
+0xb841fe5a89da1bbef2d0805fbd7ffcbbb2fca5e3

CLI/polymath-cli.js

@@ -12,9 +12,9 @@ const transfer_manager = require('./commands/transfer_manager');
 const contract_manager = require('./commands/contract_manager');
 const strMigrator = require('./commands/strMigrator');
 const permission_manager = require('./commands/permission_manager');
-const time = require('./commands/helpers/time')
+const time = require('./commands/helpers/time');
 const gbl = require('./commands/common/global');
-const program = require('commander');
+const program = require('commander');	
 const moment = require('moment');
 const yaml = require('js-yaml');
 const fs = require('fs');
@@ -162,24 +162,23 @@ program
     await permission_manager.executeApp();
   });
 
-program
-  .command('time_travel')
-  .alias('tt')
-  .option('-p, --period <seconds>', 'Period of time in seconds to increase')
-  .option('-d, --toDate <date>', 'Human readable date ("MM/DD/YY [HH:mm:ss]") to travel to')
-  .option('-e, --toEpochTime <epochTime>', 'Unix Epoch time to travel to')
-  .description('Increases time on EVM according to given value.')
-  .action(async function (cmd) {
-    await gbl.initialize(program.remoteNode);
-    if (cmd.period) {
-      await time.increaseTimeByDuration(parseInt(cmd.period));
-    } else if (cmd.toDate) {
-      await time.increaseTimeToDate(cmd.toDate);
-    } else if (cmd.toEpochTime) {
-      await time.increaseTimeToEpochDate(cmd.toEpochTime);
-    }
+  program	
+  .command('time_travel')	
+  .alias('tt')	
+  .option('-p, --period <seconds>', 'Period of time in seconds to increase')	
+  .option('-d, --toDate <date>', 'Human readable date ("MM/DD/YY [HH:mm:ss]") to travel to')	
+  .option('-e, --toEpochTime <epochTime>', 'Unix Epoch time to travel to')	
+  .description('Increases time on EVM according to given value.')	
+  .action(async function (cmd) {	
+    await gbl.initialize(program.remoteNode);	
+    if (cmd.period) {	
+      await time.increaseTimeByDuration(parseInt(cmd.period));	
+    } else if (cmd.toDate) {	
+      await time.increaseTimeToDate(cmd.toDate);	
+    } else if (cmd.toEpochTime) {	
+      await time.increaseTimeToEpochDate(cmd.toEpochTime);	
+    }	
   });
-
 program.parse(process.argv);
 
 if (typeof program.commands.length == 0) {