Merge master into dev-2.1.0

CHANGELOG.md

@@ -5,7 +5,7 @@ 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.0.1
 * `rate` is now accepted as multiplied by 10^18 to allow settting higher price than 1ETH/POLY per token.
 
 ## USDTieredSTO 2.0.1

CLI/commands/ST20Generator.js

@@ -29,7 +29,7 @@ async function executeApp(_ticker, _transferOwnership, _name, _details, _divisib
   try {
     await step_ticker_registration(_ticker);
     if (!tokenLaunched) {
-      await step_transfer_ticker_ownership(_transferOwnership); 
+      await step_transfer_ticker_ownership(_transferOwnership);
       await step_token_deploy(_name, _details, _divisible);
     }
     await tokenManager.executeApp(tokenSymbol);
@@ -39,7 +39,7 @@ async function executeApp(_ticker, _transferOwnership, _name, _details, _divisib
   }
 };
 
-async function setup(){
+async function setup() {
   try {
     securityTokenRegistryAddress = await contracts.securityTokenRegistry();
     let securityTokenRegistryABI = abis.securityTokenRegistry();
@@ -79,7 +79,7 @@ async function step_ticker_registration(_ticker) {
       available = true;
       await approvePoly(securityTokenRegistryAddress, regFee);
       let registerTickerAction = securityTokenRegistry.methods.registerTicker(Issuer.address, tokenSymbol, "");
-      await common.sendTransaction(registerTickerAction, {factor: 1.5});
+      await common.sendTransaction(registerTickerAction, { factor: 1.5 });
     } else if (details[0] == Issuer.address) {
       // If it has registration date and its owner is Issuer
       available = true;
@@ -107,7 +107,7 @@ async function step_transfer_ticker_ownership(_transferOwnership) {
 
   if (newOwner) {
     let transferTickerOwnershipAction = securityTokenRegistry.methods.transferTickerOwnership(newOwner, tokenSymbol);
-    let receipt = await common.sendTransaction(transferTickerOwnershipAction, {factor: 1.5});
+    let receipt = await common.sendTransaction(transferTickerOwnershipAction, { factor: 1.5 });
     let event = common.getEventFromLogs(securityTokenRegistry._jsonInterface, receipt.logs, 'ChangeTickerOwnership');
     console.log(chalk.green(`Ownership trasferred successfully. The new owner is ${event._newOwner}`));
     process.exit(0);
@@ -125,7 +125,7 @@ async function step_token_deploy(_name, _details, _divisible) {
     tokenName = _name;
     console.log(`Token Name: ${tokenName}`);
   } else {
-    tokenName = readlineSync.question('Enter the name for your new token: ', {defaultInput: 'default'});
+    tokenName = readlineSync.question('Enter the name for your new token: ', { defaultInput: 'default' });
   }
 
   let tokenDetails;
@@ -195,16 +195,16 @@ async function approvePoly(spender, fee) {
       await common.sendTransaction(approveAction);
     }
   } else {
-      let requiredBalance = parseInt(requiredAmount) - parseInt(polyBalance);
-      console.log(chalk.red(`\n*****************************************************************************************************************************************`));
-      console.log(chalk.red(`Not enough balance to Pay the Fee, Require ${(new BigNumber(requiredBalance).dividedBy(new BigNumber(10).pow(18))).toNumber()} POLY but have ${(new BigNumber(polyBalance).dividedBy(new BigNumber(10).pow(18))).toNumber()} POLY. Access POLY faucet to get the POLY to complete this txn`));
-      console.log(chalk.red(`******************************************************************************************************************************************\n`));
-      process.exit(0);
+    let requiredBalance = parseInt(requiredAmount) - parseInt(polyBalance);
+    console.log(chalk.red(`\n*****************************************************************************************************************************************`));
+    console.log(chalk.red(`Not enough balance to Pay the Fee, Require ${(new BigNumber(requiredBalance).dividedBy(new BigNumber(10).pow(18))).toNumber()} POLY but have ${(new BigNumber(polyBalance).dividedBy(new BigNumber(10).pow(18))).toNumber()} POLY. Access POLY faucet to get the POLY to complete this txn`));
+    console.log(chalk.red(`******************************************************************************************************************************************\n`));
+    process.exit(0);
   }
 }
 
 module.exports = {
-  executeApp: async function(ticker, transferOwnership, name, details, divisible) {
+  executeApp: async function (ticker, transferOwnership, name, details, divisible) {
     return executeApp(ticker, transferOwnership, name, details, divisible);
   }
 }

CLI/commands/common/common_functions.js

@@ -34,13 +34,14 @@ function getFinalOptions(options) {
     from: Issuer,
     gasPrice: defaultGasPrice,
     value: undefined,
-    factor: 1.2
+    factor: 1.2,
+    minNonce: 0
   }
   return Object.assign(defaultOptions, options)
 };
 
 async function getGasLimit(options, action) {
-  let block = await web3.eth.getBlock("latest");
+  let block = await web3.eth.getBlock('latest');
   let networkGasLimit = block.gasLimit;
   let gas = Math.round(options.factor * (await action.estimateGas({ from: options.from.address, value: options.value })));
   return (gas > networkGasLimit) ? networkGasLimit : gas;
@@ -98,6 +99,9 @@ module.exports = {
            %%%.                                                                                                                                                
 `);
   },
+  getNonce: async function (from) {
+    return (await web3.eth.getTransactionCount(from.address, "pending"));
+  },
   sendTransaction: async function (action, options) {
     await checkPermissions(action);
 
@@ -107,6 +111,9 @@ module.exports = {
     console.log(chalk.black.bgYellowBright(`---- Transaction executed: ${action._method.name} - Gas limit provided: ${gasLimit} ----`));
 
     let nonce = await web3.eth.getTransactionCount(options.from.address);
+    if (nonce < options.minNonce) {
+      nonce = minNonce;
+    }
     let abi = action.encodeABI();
     let parameter = {
       from: options.from.address,

CLI/commands/common/global.js

@@ -3,7 +3,7 @@ const constants = require('./constants');
 
 global.web3, global.Issuer, global.defaultGasPrice, global.remoteNetwork;
 
-function getGasPrice (networkId) {
+function getGasPrice(networkId) {
   let gasPrice;
   switch (networkId) {
     case 1: //Mainnet
@@ -36,7 +36,7 @@ async function httpProvider(url, file) {
 }
 
 module.exports = {
-  initialize: async function(network) {
+  initialize: async function (network) {
     remoteNetwork = network;
     if (typeof web3 === 'undefined' || typeof Issuer === 'undefined' || typeof defaultGasPrice === 'undefined') {
       if (typeof remoteNetwork !== 'undefined') {

CLI/commands/helpers/contract_addresses.js

@@ -7,7 +7,7 @@ function getPolymathRegistryAddress(networkId) {
   let result;
   switch (networkId) {
     case 1: // MAINNET
-      result = "0x06595656b93ce14834f0d22b7bbda4382d5ab510";
+      result = "0xdfabf3e4793cd30affb47ab6fa4cf4eef26bbc27";
       break;
     case 3: // ROPSTEN
       result = "";
@@ -16,7 +16,7 @@ function getPolymathRegistryAddress(networkId) {
       result = JSON.parse(require('fs').readFileSync('./build/contracts/PolymathRegistry.json').toString()).networks[networkId].address;
       break;
     case 42: // KOVAN
-      result = "0xad09dc7939f09601674c69a07132bc642abeeb10";
+      result = "0x5b215a7d39ee305ad28da29bf2f0425c6c2a00b3";
       break;
   }