Skip to content

Commit

Permalink
CLI Fixes for remaining transfer manager modules
Browse files Browse the repository at this point in the history
  • Loading branch information
@F-OBrien
F-OBrien committed May 12, 2019
1 parent 203819f commit 95fcd0a
Show file tree
Hide file tree
Showing 3 changed files with 68 additions and 65 deletions.
121 changes: 62 additions & 59 deletions CLI/commands/transfer_manager.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ async function addTransferManagerModule() {
break;
}
let selectedTMFactoryAddress = await contracts.getModuleFactoryAddressByName(securityToken.options.address, gbl.constants.MODULES_TYPES.TRANSFER, options[index]);
let addModuleAction = securityToken.methods.addModule(selectedTMFactoryAddress, bytes, 0, 0);
let addModuleAction = securityToken.methods.addModule(selectedTMFactoryAddress, bytes, 0, 0, false);
let receipt = await common.sendTransaction(addModuleAction);
let event = common.getEventFromLogs(securityToken._jsonInterface, receipt.logs, 'ModuleAdded');
console.log(chalk.green(`Module deployed at address: ${event._module}`));
Expand Down Expand Up @@ -442,7 +442,7 @@ async function generalTransferManager() {
"Is Volume Restricted",
"Custom Flag"
);
let index = readlineSync.keyInSelect(options, 'Select the flag you wish to set: ', { cancel: 'RETURN' });
let index = readlineSync.keyInSelect(options, 'Select the flag you wish to set: ', { cancel: false });
let optionSelected = index !== -1 ? options[index] : 'RETURN';
console.log('Selected:', optionSelected, '\n');
let flag
Expand Down Expand Up @@ -1301,6 +1301,8 @@ async function percentageTransferManager() {
console.log(chalk.green(`Transactions which are part of the primary issuance will NOT be ignored!`));
}
break;
case 'RETURN':
return;
}

await percentageTransferManager();
Expand Down Expand Up @@ -1754,29 +1756,29 @@ async function removeInvestorsFromBlacklistsInBatch() {
async function volumeRestrictionTM() {
console.log('\n', chalk.blue(`Volume Restriction Transfer Manager at ${currentTransferManager.options.address}`, '\n'));

let globalDailyRestriction = await currentTransferManager.methods.defaultDailyRestriction().call();
let hasGlobalDailyRestriction = parseInt(globalDailyRestriction.startTime) !== 0;
let globalCustomRestriction = await currentTransferManager.methods.defaultRestriction().call();
let hasGlobalCustomRestriction = parseInt(globalCustomRestriction.startTime) !== 0;
let globalDailyRestriction = await currentTransferManager.methods.getDefaultDailyRestriction().call();
let hasGlobalDailyRestriction = parseInt(globalDailyRestriction[1]) !== 0; //startTime
let globalCustomRestriction = await currentTransferManager.methods.getDefaultRestriction().call();
let hasGlobalCustomRestriction = parseInt(globalCustomRestriction[1]) !== 0; //startime

console.log(`- Default daily restriction: ${hasGlobalDailyRestriction ? '' : 'None'}`);
if (hasGlobalDailyRestriction) {
console.log(` Type: ${RESTRICTION_TYPES[globalDailyRestriction.typeOfRestriction]}`);
console.log(` Allowed tokens: ${globalDailyRestriction.typeOfRestriction === "0" ? `${web3.utils.fromWei(globalDailyRestriction.allowedTokens)} ${tokenSymbol}` : `${fromWeiPercentage(globalDailyRestriction.allowedTokens)}%`}`);
console.log(` Start time: ${moment.unix(globalDailyRestriction.startTime).format('MMMM Do YYYY, HH:mm:ss')}`);
console.log(` Rolling period: ${globalDailyRestriction.rollingPeriodInDays} days`);
console.log(` End time: ${moment.unix(globalDailyRestriction.endTime).format('MMMM Do YYYY, HH:mm:ss')} `);
console.log(` Type: ${RESTRICTION_TYPES[globalDailyRestriction[4]]}`);
console.log(` Allowed tokens: ${globalDailyRestriction[4] === "0" ? `${web3.utils.fromWei(globalDailyRestriction[0])} ${tokenSymbol}` : `${fromWeiPercentage(globalDailyRestriction[0])}%`}`);
console.log(` Start time: ${moment.unix(globalDailyRestriction[1]).format('MMMM Do YYYY, HH:mm:ss')}`);
console.log(` Rolling period: ${globalDailyRestriction[2]} days`);
console.log(` End time: ${moment.unix(globalDailyRestriction[3]).format('MMMM Do YYYY, HH:mm:ss')} `);
}
console.log(`- Default custom restriction: ${hasGlobalCustomRestriction ? '' : 'None'}`);
if (hasGlobalCustomRestriction) {
console.log(` Type: ${RESTRICTION_TYPES[globalCustomRestriction.typeOfRestriction]}`);
console.log(` Allowed tokens: ${globalCustomRestriction.typeOfRestriction === "0" ? `${web3.utils.fromWei(globalCustomRestriction.allowedTokens)} ${tokenSymbol}` : `${fromWeiPercentage(globalCustomRestriction.allowedTokens)}%`}`);
console.log(` Start time: ${moment.unix(globalCustomRestriction.startTime).format('MMMM Do YYYY, HH:mm:ss')}`);
console.log(` Rolling period: ${globalCustomRestriction.rollingPeriodInDays} days`);
console.log(` End time: ${moment.unix(globalCustomRestriction.endTime).format('MMMM Do YYYY, HH:mm:ss')} `);
console.log(` Type: ${RESTRICTION_TYPES[globalCustomRestriction[4]]}`);
console.log(` Allowed tokens: ${globalCustomRestriction[4] === "0" ? `${web3.utils.fromWei(globalCustomRestriction[0])} ${tokenSymbol}` : `${fromWeiPercentage(globalCustomRestriction[0])}%`}`);
console.log(` Start time: ${moment.unix(globalCustomRestriction[1]).format('MMMM Do YYYY, HH:mm:ss')}`);
console.log(` Rolling period: ${globalCustomRestriction[2]} days`);
console.log(` End time: ${moment.unix(globalCustomRestriction[3]).format('MMMM Do YYYY, HH:mm:ss')} `);
}

let addressesAndRestrictions = await currentTransferManager.methods.getRestrictedData().call();
let addressesAndRestrictions = await currentTransferManager.methods.getRestrictionData().call();
console.log(`- Individual restrictions: ${addressesAndRestrictions.allAddresses.length}`);
let exemptedAddresses = await currentTransferManager.methods.getExemptAddress().call();
console.log(`- Exempted addresses: ${exemptedAddresses.length}`);
Expand Down Expand Up @@ -1842,8 +1844,8 @@ function showRestrictionTable(investorArray, amountArray, typeArray, rollingPeri
investorArray[i],
typeArray[i] === "0" ? `${web3.utils.fromWei(amountArray[i])} ${tokenSymbol}` : `${fromWeiPercentage(amountArray[i])}%`,
rollingPeriodArray[i],
moment.unix(startTimeArray[i]).format('MM/DD/YYYY HH:mm'),
moment.unix(endTimeTimeArray[i]).format('MM/DD/YYYY HH:mm')
moment.unix(startTimeArray[i]).format('MMM Do YYYY HH:mm'),
moment.unix(endTimeTimeArray[i]).format('MMM Do YYYY HH:mm')
]);
}
console.log();
Expand Down Expand Up @@ -1979,28 +1981,28 @@ async function changeIndividualRestrictions() {
limitMessage: "Must be a valid address"
});

let currentDailyRestriction = await currentTransferManager.methods.individualDailyRestriction(holder).call();
let hasDailyRestriction = parseInt(currentDailyRestriction.startTime) !== 0;
let currentCustomRestriction = await currentTransferManager.methods.individualRestriction(holder).call();
let hasCustomRestriction = parseInt(currentCustomRestriction.startTime) !== 0;
let currentDailyRestriction = await currentTransferManager.methods.getIndividualDailyRestriction(holder).call();
let hasDailyRestriction = parseInt(currentDailyRestriction[1]) !== 0;
let currentCustomRestriction = await currentTransferManager.methods.getIndividualRestriction(holder).call();
let hasCustomRestriction = parseInt(currentCustomRestriction[1]) !== 0;

console.log(`*** Current individual restrictions for ${holder} ***`, '\n');

console.log(`- Daily restriction: ${hasDailyRestriction ? '' : 'None'}`);
if (hasDailyRestriction) {
console.log(` Type: ${RESTRICTION_TYPES[currentDailyRestriction.typeOfRestriction]}`);
console.log(` Allowed tokens: ${currentDailyRestriction.typeOfRestriction === "0" ? `${web3.utils.fromWei(currentDailyRestriction.allowedTokens)} ${tokenSymbol}` : `${fromWeiPercentage(currentDailyRestriction.allowedTokens)}%`}`);
console.log(` Start time: ${moment.unix(currentDailyRestriction.startTime).format('MMMM Do YYYY, HH:mm:ss')}`);
console.log(` Rolling period: ${currentDailyRestriction.rollingPeriodInDays} days`);
console.log(` End time: ${moment.unix(currentDailyRestriction.endTime).format('MMMM Do YYYY, HH:mm:ss')} `);
console.log(` Type: ${RESTRICTION_TYPES[currentDailyRestriction[4]]}`);
console.log(` Allowed tokens: ${currentDailyRestriction[4] === "0" ? `${web3.utils.fromWei(currentDailyRestriction[0])} ${tokenSymbol}` : `${fromWeiPercentage(currentDailyRestriction[0])}%`}`);
console.log(` Start time: ${moment.unix(currentDailyRestriction[1]).format('MMMM Do YYYY, HH:mm:ss')}`);
console.log(` Rolling period: ${currentDailyRestriction[2]} days`);
console.log(` End time: ${moment.unix(currentDailyRestriction[3]).format('MMMM Do YYYY, HH:mm:ss')} `);
}
console.log(`- Custom restriction: ${hasCustomRestriction ? '' : 'None'} `);
if (hasCustomRestriction) {
console.log(` Type: ${RESTRICTION_TYPES[currentCustomRestriction.typeOfRestriction]}`);
console.log(` Allowed tokens: ${currentCustomRestriction.typeOfRestriction === "0" ? `${web3.utils.fromWei(currentCustomRestriction.allowedTokens)} ${tokenSymbol}` : `${fromWeiPercentage(currentCustomRestriction.allowedTokens)}%`}`);
console.log(` Start time: ${moment.unix(currentCustomRestriction.startTime).format('MMMM Do YYYY, HH:mm:ss')}`);
console.log(` Rolling period: ${currentCustomRestriction.rollingPeriodInDays} days`);
console.log(` End time: ${moment.unix(currentCustomRestriction.endTime).format('MMMM Do YYYY, HH:mm:ss')} `);
console.log(` Type: ${RESTRICTION_TYPES[currentCustomRestriction[4]]}`);
console.log(` Allowed tokens: ${currentCustomRestriction[4] === "0" ? `${web3.utils.fromWei(currentDailyRestriction[0])} ${tokenSymbol}` : `${fromWeiPercentage(currentDailyRestriction[0])}%`}`);
console.log(` Start time: ${moment.unix(currentCustomRestriction[1]).format('MMMM Do YYYY, HH:mm:ss')}`);
console.log(` Rolling period: ${currentCustomRestriction[2]} days`);
console.log(` End time: ${moment.unix(currentCustomRestriction[3]).format('MMMM Do YYYY, HH:mm:ss')} `);
}

let options = [];
Expand Down Expand Up @@ -2099,54 +2101,55 @@ async function exploreAccount() {
limitMessage: "Must be a valid address"
});

let appliyngDailyRestriction = null;
let applyingDailyRestriction = null;
let applyingCustomRestriction = null;
let hasIndividualRestrictions = false;
let isExempted = await currentTransferManager.methods.exemptList(account).call();
let exempted = await currentTransferManager.methods.getExemptAddress().call();
let isExempted = exempted.includes(account);
if (!isExempted) {
let individuallDailyRestriction = await currentTransferManager.methods.individualDailyRestriction(account).call();
if (parseInt(individuallDailyRestriction.endTime) !== 0) {
appliyngDailyRestriction = individuallDailyRestriction;
let individuallDailyRestriction = await currentTransferManager.methods.getIndividualDailyRestriction(account).call();
if (parseInt(individuallDailyRestriction[3]) !== 0) {
applyingDailyRestriction = individuallDailyRestriction;
}
let customRestriction = await currentTransferManager.methods.individualRestriction(account).call();
if (parseInt(customRestriction.endTime) !== 0) {
let customRestriction = await currentTransferManager.methods.getIndividualRestriction(account).call();
if (parseInt(customRestriction[3]) !== 0) {
applyingCustomRestriction = customRestriction;
}

hasIndividualRestrictions = applyingCustomRestriction || appliyngDailyRestriction;
hasIndividualRestrictions = applyingCustomRestriction || applyingDailyRestriction;

if (!hasIndividualRestrictions) {
let globalDailyRestriction = await currentTransferManager.methods.defaultDailyRestriction().call();
if (parseInt(globalDailyRestriction.endTime) !== 0) {
appliyngDailyRestriction = globalDailyRestriction;
let globalDailyRestriction = await currentTransferManager.methods.getDefaultDailyRestriction().call();
if (parseInt(globalDailyRestriction[3]) !== 0) {
applyingDailyRestriction = globalDailyRestriction;
}
let globalCustomRestriction = await currentTransferManager.methods.defaultRestriction().call();
if (parseInt(globalCustomRestriction.endTime) === 0) {
let globalCustomRestriction = await currentTransferManager.methods.getDefaultRestriction().call();
if (parseInt(globalCustomRestriction[3]) === 0) {
applyingCustomRestriction = globalCustomRestriction;
}
}
}

console.log(`*** Applying restrictions for ${account} ***`, '\n');

console.log(`- Daily restriction: ${appliyngDailyRestriction ? (!hasIndividualRestrictions ? 'global' : '') : 'None'}`);
if (appliyngDailyRestriction) {
console.log(` Type: ${RESTRICTION_TYPES[appliyngDailyRestriction.typeOfRestriction]}`);
console.log(` Allowed tokens: ${appliyngDailyRestriction.typeOfRestriction === "0" ? `${web3.utils.fromWei(appliyngDailyRestriction.allowedTokens)} ${tokenSymbol}` : `${fromWeiPercentage(appliyngDailyRestriction.allowedTokens)}%`}`);
console.log(` Start time: ${moment.unix(appliyngDailyRestriction.startTime).format('MMMM Do YYYY, HH:mm:ss')}`);
console.log(` Rolling period: ${appliyngDailyRestriction.rollingPeriodInDays} days`);
console.log(` End time: ${moment.unix(appliyngDailyRestriction.endTime).format('MMMM Do YYYY, HH:mm:ss')} `);
console.log(`- Daily restriction: ${applyingDailyRestriction ? (!hasIndividualRestrictions ? 'global' : '') : 'None'}`);
if (applyingDailyRestriction) {
console.log(` Type: ${RESTRICTION_TYPES[applyingDailyRestriction[4]]}`);
console.log(` Allowed tokens: ${applyingDailyRestriction[4] === "0" ? `${web3.utils.fromWei(applyingDailyRestriction[0])} ${tokenSymbol}` : `${fromWeiPercentage(applyingDailyRestriction[0])}%`}`);
console.log(` Start time: ${moment.unix(applyingDailyRestriction[1]).format('MMMM Do YYYY, HH:mm:ss')}`);
console.log(` Rolling period: ${applyingDailyRestriction[2]} days`);
console.log(` End time: ${moment.unix(applyingDailyRestriction[3]).format('MMMM Do YYYY, HH:mm:ss')} `);
}
console.log(`- Other restriction: ${applyingCustomRestriction ? (!hasIndividualRestrictions ? 'global' : '') : 'None'} `);
if (applyingCustomRestriction) {
console.log(` Type: ${RESTRICTION_TYPES[applyingCustomRestriction.typeOfRestriction]}`);
console.log(` Allowed tokens: ${applyingCustomRestriction.typeOfRestriction === "0" ? `${web3.utils.fromWei(applyingCustomRestriction.allowedTokens)} ${tokenSymbol}` : `${fromWeiPercentage(applyingCustomRestriction.allowedTokens)}%`}`);
console.log(` Start time: ${moment.unix(applyingCustomRestriction.startTime).format('MMMM Do YYYY, HH:mm:ss')}`);
console.log(` Rolling period: ${applyingCustomRestriction.rollingPeriodInDays} days`);
console.log(` End time: ${moment.unix(applyingCustomRestriction.endTime).format('MMMM Do YYYY, HH:mm:ss')} `);
console.log(` Type: ${RESTRICTION_TYPES[applyingCustomRestriction[4]]}`);
console.log(` Allowed tokens: ${applyingCustomRestriction[4] === "0" ? `${web3.utils.fromWei(applyingCustomRestriction[0])} ${tokenSymbol}` : `${fromWeiPercentage(applyingCustomRestriction[0])}%`}`);
console.log(` Start time: ${moment.unix(applyingCustomRestriction[1]).format('MMMM Do YYYY, HH:mm:ss')}`);
console.log(` Rolling period: ${applyingCustomRestriction[2]} days`);
console.log(` End time: ${moment.unix(applyingCustomRestriction[3]).format('MMMM Do YYYY, HH:mm:ss')} `);
}

if (applyingCustomRestriction || appliyngDailyRestriction) {
if (applyingCustomRestriction || applyingDailyRestriction) {
let bucketDetails;
if (hasIndividualRestrictions) {
bucketDetails = await currentTransferManager.methods.getIndividualBucketDetailsToUser(account).call();
Expand Down
6 changes: 3 additions & 3 deletions CLI/data/Transfer/VRTM/add_custom_restriction_data.csv
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
0xee7ae74d964f2be7d72c1b187b38e2ed3615d4d1,1000,8/1/2019,90,10/10/2019,"Fixed"
0xee7ae74d964f2be7d72c1b187b38e2ed3615d4d1,1000,8/1/2019,90,12/10/2019,"Fixed"
0x2f0fd672bf222413cc69dc1f4f1d7e93ad1763a1,2000,8/2/2019,30,10/12/2019,"Fixed"
0xac297053173b02b02a737d47f7b4a718e5b170ef,500,8/1/2019,15,10/1/2019,"Fixed"
0x49fc0b78238dab644698a90fa351b4c749e123d2,0.15,8/5/2019,90,10/10/2019,"Percentage"
0x49fc0b78238dab644698a90fa351b4c749e123d2,0.15,8/5/2019,90,12/10/2019,"Percentage"
0x10223927009b8add0960359dd90d1449415b7ca9,0.25,8/3/2019,30,10/15/2019,"Percentage"
0x3c65cfe3de848cf38e9d76e9c3e57a2f1140b399,0.1,8/10/2019,15,10/10/2019,"Percentage"
0xabf60de3265b3017db7a1be66fc8b364ec1dbb98,1234,8/20/2019,10,10/22/2019,"Fixed"
0xb841fe5a89da1bbef2d0805fbd7ffcbbb2fca5e3,5678,8/1/2019,2,10/10/2019,"Fixed"
0xb841fe5a89da1bbef2d0805fbd7ffcbbb2fca5e3,5678,8/1/2019,2,10/10/2019,"Fixed"
6 changes: 3 additions & 3 deletions CLI/data/Transfer/VRTM/modify_custom_restriction_data.csv
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
0xee7ae74d964f2be7d72c1b187b38e2ed3615d4d1,2000,8/1/2019,90,10/10/2019,"Fixed"
0xee7ae74d964f2be7d72c1b187b38e2ed3615d4d1,2000,8/1/2019,90,12/10/2019,"Fixed"
0x2f0fd672bf222413cc69dc1f4f1d7e93ad1763a1,2000,8/2/2019,30,10/10/2019,"Fixed"
0xac297053173b02b02a737d47f7b4a718e5b170ef,500,8/1/2019,20,10/10/2019,"Fixed"
0x49fc0b78238dab644698a90fa351b4c749e123d2,0.15,8/1/2019,90,20/10/2019,"Percentage"
0x10223927009b8add0960359dd90d1449415b7ca9,25,8/1/2019,30,10/10/2019,"Fixed"
0x49fc0b78238dab644698a90fa351b4c749e123d2,0.15,8/1/2019,90,12/10/2019,"Percentage"
0x10223927009b8add0960359dd90d1449415b7ca9,25,8/1/2019,30,10/10/2019,"Fixed"

0 comments on commit 95fcd0a

Please sign in to comment.