Skip to content

CLI dividend name #303

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 2, 2018
Merged

CLI dividend name #303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
874b81b
CLI: rename of getModulesByTypeAndToken function
VictorVicente Oct 2, 2018
96399a7
CLI: Dividend name or title
VictorVicente Oct 2, 2018
d391ea1
Merge branch 'development-1.5.0' into CLI-minor-updates
pabloruiz55 Oct 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 14 additions & 12 deletions CLI/commands/dividends_manager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,10 +137,11 @@ async function start_explorer(){
await taxHoldingMenu();
break;
case 'Create dividends':
let dividend = readlineSync.question(`How much ${dividendsType} would you like to distribute to token holders?: `);
let divName = readlineSync.question(`Enter a name or title to indetify this dividend: `);
let dividend = readlineSync.question(`How much ${dividendsType} would you like to distribute to token holders?: `);
await checkBalance(dividend);
let checkpointId = currentCheckpoint == 0 ? 0 : await selectCheckpoint(true); // If there are no checkpoints, it must create a new one
await createDividends(dividend, checkpointId);
await createDividends(divName, dividend, checkpointId);
break;
case 'Explore account at checkpoint':
let _address = readlineSync.question('Enter address to explore: ');
Expand Down Expand Up @@ -316,7 +317,7 @@ async function taxHoldingMenu() {
}
}

async function createDividends(dividend, checkpointId) {
async function createDividends(name, dividend, checkpointId) {
await addDividendsModule();

let time = Math.floor(Date.now()/1000);
Expand All @@ -332,17 +333,17 @@ async function createDividends(dividend, checkpointId) {
await common.sendTransaction(Issuer, approveAction, defaultGasPrice);
if (checkpointId > 0) {
if (useDefaultExcluded) {
createDividendAction = currentDividendsModule.methods.createDividendWithCheckpoint(maturityTime, expiryTime, polyToken._address, web3.utils.toWei(dividend), checkpointId);
createDividendAction = currentDividendsModule.methods.createDividendWithCheckpoint(maturityTime, expiryTime, polyToken._address, web3.utils.toWei(dividend), checkpointId, web3.utils.toHex(name));
} else {
let excluded = getExcludedFromDataFile();
createDividendAction = currentDividendsModule.methods.createDividendWithCheckpointAndExclusions(maturityTime, expiryTime, polyToken._address, web3.utils.toWei(dividend), checkpointId, excluded);
createDividendAction = currentDividendsModule.methods.createDividendWithCheckpointAndExclusions(maturityTime, expiryTime, polyToken._address, web3.utils.toWei(dividend), checkpointId, excluded, web3.utils.toHex(name));
}
} else {
if (useDefaultExcluded) {
createDividendAction = currentDividendsModule.methods.createDividend(maturityTime, expiryTime, polyToken._address, web3.utils.toWei(dividend));
createDividendAction = currentDividendsModule.methods.createDividend(maturityTime, expiryTime, polyToken._address, web3.utils.toWei(dividend), web3.utils.toHex(name));
} else {
let excluded = getExcludedFromDataFile();
createDividendAction = currentDividendsModule.methods.createDividendWithExclusions(maturityTime, expiryTime, polyToken._address, web3.utils.toWei(dividend), excluded);
createDividendAction = currentDividendsModule.methods.createDividendWithExclusions(maturityTime, expiryTime, polyToken._address, web3.utils.toWei(dividend), excluded, web3.utils.toHex(name));
}
}
let receipt = await common.sendTransaction(Issuer, createDividendAction, defaultGasPrice);
Expand All @@ -351,17 +352,17 @@ async function createDividends(dividend, checkpointId) {
} else if (dividendsType == 'ETH') {
if (checkpointId > 0) {
if (useDefaultExcluded) {
createDividendAction = currentDividendsModule.methods.createDividendWithCheckpoint(maturityTime, expiryTime, checkpointId);
createDividendAction = currentDividendsModule.methods.createDividendWithCheckpoint(maturityTime, expiryTime, checkpointId, web3.utils.toHex(name));
} else {
let excluded = getExcludedFromDataFile();
createDividendAction = currentDividendsModule.methods.createDividendWithCheckpointAndExclusions(maturityTime, expiryTime, checkpointId, excluded);
createDividendAction = currentDividendsModule.methods.createDividendWithCheckpointAndExclusions(maturityTime, expiryTime, checkpointId, excluded, web3.utils.toHex(name));
}
} else {
if (useDefaultExcluded) {
createDividendAction = currentDividendsModule.methods.createDividend(maturityTime, expiryTime);
createDividendAction = currentDividendsModule.methods.createDividend(maturityTime, expiryTime, web3.utils.toHex(name));
} else {
let excluded = getExcludedFromDataFile();
createDividendAction = currentDividendsModule.methods.createDividendWithExclusions(maturityTime, expiryTime, excluded);
createDividendAction = currentDividendsModule.methods.createDividendWithExclusions(maturityTime, expiryTime, excluded, web3.utils.toHex(name));
}
}
let receipt = await common.sendTransaction(Issuer, createDividendAction, defaultGasPrice, web3.utils.toWei(dividend));
Expand Down Expand Up @@ -543,7 +544,8 @@ async function selectDividend(filter) {

if (dividends.length > 0) {
let options = dividends.map(function(d) {
return `Created: ${moment.unix(d.created).format('MMMM Do YYYY, HH:mm:ss')}
return `${web3.utils.toAscii(d.name)}
Created: ${moment.unix(d.created).format('MMMM Do YYYY, HH:mm:ss')}
Maturity: ${moment.unix(d.maturity).format('MMMM Do YYYY, HH:mm:ss')}
Expiry: ${moment.unix(d.expiry).format('MMMM Do YYYY, HH:mm:ss')}
At checkpoint: ${d.checkpointId}
Expand Down
2 changes: 1 addition & 1 deletion CLI/commands/helpers/contract_addresses.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ module.exports = {
},
getModuleFactoryAddressByName: async function(stAddress, moduleType, moduleName) {
let moduleRegistry = await getModuleRegistry();
let availableModules = await moduleRegistry.methods.getAvailableModulesOfType(moduleType, stAddress).call();
let availableModules = await moduleRegistry.methods.getModulesByTypeAndToken(moduleType, stAddress).call();

let result = null;
let counter = 0;
Expand Down