Merge pull request #264 from PolymathNetwork/CLI-new-STR-fixes

CLI fixes for new STR
PolymathNetwork · Sep 19, 2018 · d611a29 · d611a29
2 parents 007ab6d + 70a8796
commit d611a29
Show file tree

Hide file tree

Showing 25 changed files with 14 additions and 203 deletions.
diff --git a/CLI/commands/ST20Generator.js b/CLI/commands/ST20Generator.js
@@ -7,7 +7,6 @@ var abis = require('./helpers/contract_abis');
 var common = require('./common/common_functions');
 var global = require('./common/global');
 
-let tickerRegistryAddress;
 let securityTokenRegistryAddress;
 let cappedSTOFactoryAddress;
 let usdTieredSTOFactoryAddress;
@@ -25,7 +24,6 @@ const usdTieredSTOFee = 100000;
 const tokenDetails = "";
 ////////////////////////
 // Artifacts
-let tickerRegistry;
 let securityTokenRegistry;
 let polyToken;
 let securityToken;
@@ -70,11 +68,6 @@ async function executeApp(tokenConfig, mintingConfig, stoConfig, remoteNetwork)
 
 async function setup(){
   try {
-    tickerRegistryAddress = await contracts.tickerRegistry();
-    let tickerRegistryABI = abis.tickerRegistry();
-    tickerRegistry = new web3.eth.Contract(tickerRegistryABI, tickerRegistryAddress);
-    tickerRegistry.setProvider(web3.currentProvider);
-
     securityTokenRegistryAddress = await contracts.securityTokenRegistry();
     let securityTokenRegistryABI = abis.securityTokenRegistry();
     securityTokenRegistry = new web3.eth.Contract(securityTokenRegistryABI, securityTokenRegistryAddress);
@@ -117,7 +110,7 @@ async function step_ticker_reg(){
       tokenSymbol = readlineSync.question('Enter the symbol for your new token: '); 
     }
 
-    await tickerRegistry.methods.getDetails(tokenSymbol).call({}, function(error, result){
+    await securityTokenRegistry.methods.getTickerDetails(tokenSymbol).call({}, function(error, result){
       if (new BigNumber(result[1]).toNumber() == 0) {
         available = true;
       } else if (result[0] == Issuer.address) {
@@ -131,8 +124,8 @@ async function step_ticker_reg(){
   }
 
   if (!alreadyRegistered) {
-    await step_approval(tickerRegistryAddress, regFee);
-    let registerTickerAction = tickerRegistry.methods.registerTicker(Issuer.address, tokenSymbol, "");
+    await step_approval(securityTokenRegistryAddress, regFee);
+    let registerTickerAction = securityTokenRegistry.methods.registerTicker(Issuer.address, tokenSymbol, "");
     await common.sendTransaction(Issuer, registerTickerAction, defaultGasPrice);
   }
 }

diff --git a/CLI/commands/TickerRollForward.js b/CLI/commands/TickerRollForward.js
@@ -20,8 +20,8 @@ let failed_tickers = [];
 let totalGas = BigNumber(0);
 
 let polyToken;
-let tickerRegistry;
-let tickerRegistryAddress;
+let securityTokenRegistry;
+let securityTokenRegistryAddress;
 
 function Ticker(_owner, _symbol, _name) {
     this.owner = _owner;
@@ -49,10 +49,10 @@ startScript();
 async function startScript() {
   await global.initialize(remoteNetwork);
 
-  let tickerRegistryAddress = await contracts.tickerRegistry();
-  let tickerRegistryABI = abis.tickerRegistry();
-  tickerRegistry = new web3.eth.Contract(tickerRegistryABI, tickerRegistryAddress);
-  tickerRegistry.setProvider(web3.currentProvider);
+  securityTokenRegistryAddress = await contracts.securityTokenRegistry();
+  let securityTokenRegistryABI = abis.securityTokenRegistry();
+  securityTokenRegistry = new web3.eth.Contract(securityTokenRegistryABI, securityTokenRegistryAddress);
+  securityTokenRegistry.setProvider(web3.currentProvider);
 
   let polytokenAddress = await contracts.polyToken();
   let polytokenABI = abis.polyToken();
@@ -78,7 +78,7 @@ async function readFile() {
 async function registerTickers() {
   // Poly approval for registration fees
   let polyBalance = BigNumber(await polyToken.methods.balanceOf(Issuer.address).call());
-  let fee = await tickerRegistry.methods.registrationFee().call();
+  let fee = await securityTokenRegistry.methods.getUintValues(web3.utils.toHex('tickerRegFee')).call();
   let totalFee = BigNumber(ticker_data.length).mul(fee);
 
   if (totalFee.gt(polyBalance)) {
@@ -87,7 +87,7 @@ async function registerTickers() {
     console.log(chalk.red(`*******************************************************************************\n`));
     process.exit(0);
   } else {
-    let approveAction = polyToken.methods.approve(tickerRegistryAddress, totalFee);
+    let approveAction = polyToken.methods.approve(securityTokenRegistryAddress, totalFee);
     let receipt = await common.sendTransaction(Issuer, approveAction, defaultGasPrice);
     totalGas = totalGas.add(receipt.gasUsed);
   }
@@ -105,7 +105,7 @@ async function registerTickers() {
     }
 
     // validate ticker
-    await tickerRegistry.methods.getDetails(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;
@@ -114,7 +114,7 @@ async function registerTickers() {
 
     if (valid) {
       try {
-        let registerTickerAction = tickerRegistry.methods.registerTicker(owner, ticker_data[i].symbol, ticker_data[i].name);
+        let registerTickerAction = securityTokenRegistry.methods.registerTicker(owner, ticker_data[i].symbol, ticker_data[i].name);
         let receipt = await common.sendTransaction(Issuer, registerTickerAction, defaultGasPrice);
         registered_tickers.push(ticker_data[i]);
         console.log(ticker_data[i]);

diff --git a/CLI/commands/accredit.js b/CLI/commands/accredit.js
@@ -8,7 +8,6 @@ var contracts = require('./helpers/contract_addresses');
 var abis = require('./helpers/contract_abis')
 
 /////////////////////////////ARTIFACTS//////////////////////////////////////////
-let tickerRegistry;
 let securityTokenRegistry;
 let securityToken;
 let usdTieredSTO;
@@ -36,11 +35,6 @@ startScript();
 async function startScript() {
   await global.initialize(remoteNetwork);
   try {
-    let tickerRegistryAddress = await contracts.tickerRegistry();
-    let tickerRegistryABI = abis.tickerRegistry();
-    tickerRegistry = new web3.eth.Contract(tickerRegistryABI, tickerRegistryAddress);
-    tickerRegistry.setProvider(web3.currentProvider);
-
     let securityTokenRegistryAddress = await contracts.securityTokenRegistry();
     let securityTokenRegistryABI = abis.securityTokenRegistry();
     securityTokenRegistry = new web3.eth.Contract(securityTokenRegistryABI, securityTokenRegistryAddress);

diff --git a/CLI/commands/changeNonAccreditedLimit.js b/CLI/commands/changeNonAccreditedLimit.js
@@ -8,7 +8,6 @@ var contracts = require('./helpers/contract_addresses');
 var abis = require('./helpers/contract_abis')
 
 /////////////////////////////ARTIFACTS//////////////////////////////////////////
-let tickerRegistry;
 let securityTokenRegistry;
 let securityToken;
 let usdTieredSTO;
@@ -36,11 +35,6 @@ startScript();
 async function startScript() {
   await global.initialize(remoteNetwork);
   try {
-    let tickerRegistryAddress = await contracts.tickerRegistry();
-    let tickerRegistryABI = abis.tickerRegistry();
-    tickerRegistry = new web3.eth.Contract(tickerRegistryABI, tickerRegistryAddress);
-    tickerRegistry.setProvider(web3.currentProvider);
-
     let securityTokenRegistryAddress = await contracts.securityTokenRegistry();
     let securityTokenRegistryABI = abis.securityTokenRegistry();
     securityTokenRegistry = new web3.eth.Contract(securityTokenRegistryABI, securityTokenRegistryAddress);

diff --git a/CLI/commands/dividends_manager.js b/CLI/commands/dividends_manager.js
@@ -46,11 +46,6 @@ async function executeApp(type, remoteNetwork) {
 
 async function setup(){
   try {
-    let tickerRegistryAddress = await contracts.tickerRegistry();
-    let tickerRegistryABI = abis.tickerRegistry();
-    tickerRegistry = new web3.eth.Contract(tickerRegistryABI, tickerRegistryAddress);
-    tickerRegistry.setProvider(web3.currentProvider);
-
     let securityTokenRegistryAddress = await contracts.securityTokenRegistry();
     let securityTokenRegistryABI = abis.securityTokenRegistry();
     securityTokenRegistry = new web3.eth.Contract(securityTokenRegistryABI, securityTokenRegistryAddress);

diff --git a/CLI/commands/helpers/contract_abis.js b/CLI/commands/helpers/contract_abis.js
@@ -1,5 +1,4 @@
 let polymathRegistryABI;
-let tickerRegistryABI;
 let securityTokenRegistryABI;
 let featureRegistryABI;
 let securityTokenABI;
@@ -14,7 +13,6 @@ let etherDividendCheckpointABI;
 
 try {
     polymathRegistryABI         = JSON.parse(require('fs').readFileSync('./build/contracts/PolymathRegistry.json').toString()).abi;
-    tickerRegistryABI           = JSON.parse(require('fs').readFileSync('./build/contracts/TickerRegistry.json').toString()).abi;
     securityTokenRegistryABI    = JSON.parse(require('fs').readFileSync('./build/contracts/SecurityTokenRegistry.json').toString()).abi;
     featureRegistryABI          = JSON.parse(require('fs').readFileSync('./build/contracts/FeatureRegistry.json').toString()).abi;
     securityTokenABI            = JSON.parse(require('fs').readFileSync('./build/contracts/SecurityToken.json').toString()).abi;
@@ -35,9 +33,6 @@ module.exports = {
     polymathRegistry: function () {
         return polymathRegistryABI;
     },
-    tickerRegistry: function () {
-        return tickerRegistryABI;
-    },
     securityTokenRegistry: function () {
         return securityTokenRegistryABI;
     },

diff --git a/CLI/commands/helpers/contract_addresses.js b/CLI/commands/helpers/contract_addresses.js
@@ -52,10 +52,6 @@ module.exports = {
     let networkId = await web3.eth.net.getId();
     return getPolymathRegistryAddress(networkId);
   },
-  tickerRegistry: async function() {
-    let polymathRegistry = await getPolymathRegistry();
-    return await polymathRegistry.methods.getAddress("TickerRegistry").call();
-  },
   securityTokenRegistry: async function() {
     let polymathRegistry = await getPolymathRegistry();
     return await polymathRegistry.methods.getAddress("SecurityTokenRegistry").call();

diff --git a/CLI/commands/multi_mint.js b/CLI/commands/multi_mint.js
@@ -37,12 +37,7 @@ startScript();
 async function startScript() {
   await global.initialize(remoteNetwork);
 
-  try {
-    let tickerRegistryAddress = await contracts.tickerRegistry();
-    let tickerRegistryABI = abis.tickerRegistry();
-    tickerRegistry = new web3.eth.Contract(tickerRegistryABI, tickerRegistryAddress);
-    tickerRegistry.setProvider(web3.currentProvider);
-
+  try {    
     let securityTokenRegistryAddress = await contracts.securityTokenRegistry();
     let securityTokenRegistryABI = abis.securityTokenRegistry();
     securityTokenRegistry = new web3.eth.Contract(securityTokenRegistryABI, securityTokenRegistryAddress);

diff --git a/CLI/commands/transfer.js b/CLI/commands/transfer.js
@@ -22,11 +22,6 @@ async function startScript(tokenSymbol, transferTo, transferAmount, remoteNetwor
   await global.initialize(remoteNetwork);
 
   try {
-    let tickerRegistryAddress = await contracts.tickerRegistry();
-    let tickerRegistryABI = abis.tickerRegistry();
-    tickerRegistry = new web3.eth.Contract(tickerRegistryABI, tickerRegistryAddress);
-    tickerRegistry.setProvider(web3.currentProvider);
-
     let securityTokenRegistryAddress = await contracts.securityTokenRegistry();
     let securityTokenRegistryABI = abis.securityTokenRegistry();
     securityTokenRegistry = new web3.eth.Contract(securityTokenRegistryABI, securityTokenRegistryAddress);

diff --git a/CLI/commands/transfer_manager.js b/CLI/commands/transfer_manager.js
@@ -9,7 +9,6 @@ var abis = require('./helpers/contract_abis');
 // App flow
 let tokenSymbol;
 let securityToken;
-let tickerRegistry;
 let securityTokenRegistry;
 
 async function executeApp(remoteNetwork) {
@@ -32,11 +31,6 @@ async function executeApp(remoteNetwork) {
 
 async function setup(){
   try {
-    let tickerRegistryAddress = await contracts.tickerRegistry();
-    let tickerRegistryABI = abis.tickerRegistry();
-    tickerRegistry = new web3.eth.Contract(tickerRegistryABI, tickerRegistryAddress);
-    tickerRegistry.setProvider(web3.currentProvider);
-
     let securityTokenRegistryAddress = await contracts.securityTokenRegistry();
     let securityTokenRegistryABI = abis.securityTokenRegistry();
     securityTokenRegistry = new web3.eth.Contract(securityTokenRegistryABI, securityTokenRegistryAddress);

diff --git a/CLI/commands/whitelist.js b/CLI/commands/whitelist.js
@@ -35,11 +35,6 @@ async function startScript() {
   await global.initialize(remoteNetwork);
 
   try {
-    let tickerRegistryAddress = await contracts.tickerRegistry();
-    let tickerRegistryABI = abis.tickerRegistry();
-    tickerRegistry = new web3.eth.Contract(tickerRegistryABI, tickerRegistryAddress);
-    tickerRegistry.setProvider(web3.currentProvider);
-
     let securityTokenRegistryAddress = await contracts.securityTokenRegistry();
     let securityTokenRegistryABI = abis.securityTokenRegistry();
     securityTokenRegistry = new web3.eth.Contract(securityTokenRegistryABI, securityTokenRegistryAddress);

diff --git a/test/c_checkpoints.js b/test/c_checkpoints.js
@@ -47,7 +47,6 @@ contract('Checkpoints', accounts => {
     let I_ExchangeTransferManager;
     let I_STRProxied;
     let I_ModuleRegistry;
-    let I_TickerRegistry;
     let I_FeatureRegistry;
     let I_SecurityTokenRegistry;
     let I_STFactory;

diff --git a/test/f_ether_dividends.js b/test/f_ether_dividends.js
@@ -53,7 +53,6 @@ contract('EtherDividendCheckpoint', accounts => {
     let I_GeneralTransferManager;
     let I_ExchangeTransferManager;
     let I_ModuleRegistry;
-    let I_TickerRegistry;
     let I_FeatureRegistry;
     let I_SecurityTokenRegistry;
     let I_STRProxied;

diff --git a/test/g_general_permission_manager.js b/test/g_general_permission_manager.js
@@ -52,7 +52,6 @@ contract('GeneralPermissionManager', accounts => {
     let I_GeneralPermissionManager;
     let I_GeneralTransferManager;
     let I_ModuleRegistry;
-    let I_TickerRegistry;
     let I_FeatureRegistry;
     let I_SecurityTokenRegistry;
     let I_DummySTOFactory;

diff --git a/test/h_general_transfer_manager.js b/test/h_general_transfer_manager.js
@@ -53,7 +53,6 @@ contract('GeneralTransferManager', accounts => {
     let I_GeneralPermissionManager;
     let I_GeneralTransferManager;
     let I_ModuleRegistry;
-    let I_TickerRegistry;
     let I_FeatureRegistry;
     let I_SecurityTokenRegistry;
     let I_DummySTOFactory;

diff --git a/test/i_Issuance.js b/test/i_Issuance.js
@@ -51,7 +51,6 @@ contract('Issuance', accounts => {
     let I_GeneralPermissionManager;
     let I_GeneralTransferManager;
     let I_ModuleRegistry;
-    let I_TickerRegistry;
     let I_FeatureRegistry;
     let I_SecurityTokenRegistry;
     let I_CappedSTOFactory;

diff --git a/test/k_module_registry.js b/test/k_module_registry.js
@@ -52,7 +52,6 @@ contract('ModuleRegistry', accounts => {
     let I_GeneralPermissionManager;
     let I_GeneralTransferManager;
     let I_ModuleRegistry;
-    let I_TickerRegistry;
     let I_FeatureRegistry;
     let I_SecurityTokenRegistry;
     let I_CappedSTOFactory1;

diff --git a/test/l_percentage_transfer_manager.js b/test/l_percentage_transfer_manager.js
@@ -51,7 +51,6 @@ contract('PercentageTransferManager', accounts => {
     let I_PercentageTransferManager;
     let I_GeneralTransferManager;
     let I_ModuleRegistry;
-    let I_TickerRegistry;
     let I_FeatureRegistry;
     let I_SecurityTokenRegistry;
     let I_STRProxied;

diff --git a/test/m_presale_sto.js b/test/m_presale_sto.js
@@ -46,7 +46,6 @@ contract('PreSaleSTO', accounts => {
     let I_GeneralPermissionManager;
     let I_GeneralTransferManager;
     let I_ModuleRegistry;
-    let I_TickerRegistry;
     let I_FeatureRegistry;
     let I_SecurityTokenRegistry;
     let I_PreSaleSTOFactory;

diff --git a/test/n_security_token_registry.js b/test/n_security_token_registry.js
@@ -53,7 +53,6 @@ contract('SecurityTokenRegistry', accounts => {
     let I_GeneralPermissionManager;
     let I_GeneralTransferManager;
     let I_ModuleRegistry;
-    let I_TickerRegistry;
     let I_FeatureRegistry;
     let I_SecurityTokenRegistry;
     let I_SecurityTokenRegistryV2;

diff --git a/test/o_security_token.js b/test/o_security_token.js
@@ -58,7 +58,6 @@ contract('SecurityToken', accounts => {
     let I_GeneralPermissionManager;
     let I_GeneralTransferManager;
     let I_ModuleRegistry;
-    let I_TickerRegistry;
     let I_FeatureRegistry;
     let I_SecurityTokenRegistry;
     let I_CappedSTOFactory;

diff --git a/test/p_usd_tiered_sto.js b/test/p_usd_tiered_sto.js
@@ -48,7 +48,6 @@ contract('USDTieredSTO', accounts => {
     let I_GeneralPermissionManager;
     let I_GeneralTransferManager;
     let I_ModuleRegistry;
-    let I_TickerRegistry;
     let I_FeatureRegistry;
     let I_SecurityTokenRegistry;
     let I_USDTieredSTOFactory;

diff --git a/test/q_usd_tiered_sto_sim.js b/test/q_usd_tiered_sto_sim.js
@@ -49,7 +49,6 @@ contract('USDTieredSTO', accounts => {
     let I_GeneralPermissionManager;
     let I_GeneralTransferManager;
     let I_ModuleRegistry;
-    let I_TickerRegistry;
     let I_FeatureRegistry;
     let I_SecurityTokenRegistry;
     let I_USDTieredSTOFactory;

diff --git a/test/r_concurrent_STO.js b/test/r_concurrent_STO.js
@@ -43,7 +43,6 @@ contract('SecurityToken addModule Cap', accounts => {
     let I_GeneralTransferManagerFactory;
     let I_GeneralTransferManager;
     let I_ModuleRegistry;
-    let I_TickerRegistry;
     let I_FeatureRegistry;
     let I_STFactory;
     let I_STRProxied;