Merged conflicts with master on the CLI

Author: VictorVicente

CLI/commands/ST20Generator.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,101 +99,21 @@ module.exports = {
            %%%.                                                                                                                                                
 `);
   },
-<<<<<<< HEAD
+  getNonce: async function (from) {
+    return (await web3.eth.getTransactionCount(from.address, "pending"));
+  },
   sendTransaction: async function (action, options) {
     await checkPermissions(action);
 
     options = getFinalOptions(options);
     let gasLimit = await getGasLimit(options, action);
-=======
-  getNonce: async function(from) {
-    return (await web3.eth.getTransactionCount(from.address, "pending"));
-  },
-  sendTransaction: async function (from, action, gasPrice, value, factor) {
-    let contractRegistry = await connect(action._parent.options.jsonInterface, action._parent._address);
-    
-    //NOTE this is a condition to verify if the transaction comes from a module or not. 
-    if (contractRegistry.methods.hasOwnProperty('factory')) {
-      let moduleAddress = await contractRegistry.methods.factory().call();
-      let moduleRegistry = await connect(abis.moduleFactory(), moduleAddress)
-      let parentModule = await moduleRegistry.methods.getName().call();
-      let result = await checkPermission(web3.utils.hexToUtf8(parentModule), action._method.name, contractRegistry);
-      if (!result) {
-        console.log("You haven't the right permissions to execute this method.");
-        process.exit(0);
-      }
-    }
-
-    if (typeof factor === 'undefined') factor = 1.2;
-
-    let block = await web3.eth.getBlock("latest");
-    let networkGasLimit = block.gasLimit;
-    let gas = Math.round(factor * (await action.estimateGas({ from: from.address, value: value})));
-    if (gas > networkGasLimit) gas = networkGasLimit;
-  
-    console.log(chalk.black.bgYellowBright(`---- Transaction executed: ${action._method.name} - Gas limit provided: ${gas} ----`));    
-
-    let nonce = await web3.eth.getTransactionCount(from.address);
-    let abi = action.encodeABI();
-    let parameter = {
-      from: from.address,
-      to: action._parent._address,
-      data: abi,
-      gasLimit: gas,
-      gasPrice: gasPrice,
-      nonce: nonce,
-      value: web3.utils.toHex(value)
-    };
-    
-    const transaction = new Tx(parameter);
-    transaction.sign(Buffer.from(from.privateKey.replace('0x', ''), 'hex'));
-    return await web3.eth.sendSignedTransaction('0x' + transaction.serialize().toString('hex'))
-    .on('transactionHash', function(hash){
-      console.log(`
-  Your transaction is being processed. Please wait...
-  TxHash: ${hash}`
-      );
-    })
-    .on('receipt', function(receipt){
-      console.log(`
-  Congratulations! The transaction was successfully completed.
-  Gas used: ${receipt.gasUsed} - Gas spent: ${web3.utils.fromWei((new web3.utils.BN(gasPrice)).mul(new web3.utils.BN(receipt.gasUsed)))} Ether
-  Review it on Etherscan.
-  TxHash: ${receipt.transactionHash}\n`
-      );
-    });
-  },
-  sendTransactionWithNonce: async function (from, action, gasPrice, minNonce, value, factor) {
-    let contractRegistry = await connect(action._parent.options.jsonInterface, action._parent._address);
-    
-    //NOTE this is a condition to verify if the transaction comes from a module or not. 
-    if (contractRegistry.methods.hasOwnProperty('factory')) {
-      let moduleAddress = await contractRegistry.methods.factory().call();
-      let moduleRegistry = await connect(abis.moduleFactory(), moduleAddress)
-      let parentModule = await moduleRegistry.methods.getName().call();
-      let result = await checkPermission(web3.utils.hexToUtf8(parentModule), action._method.name, contractRegistry);
-      if (!result) {
-        console.log("You haven't the right permissions to execute this method.");
-        process.exit(0);
-      }
-    }
-    if (typeof factor === 'undefined') factor = 1.2;
-
-    let block = await web3.eth.getBlock("latest");
-    let networkGasLimit = block.gasLimit;
->>>>>>> master-dev-2.1
 
     console.log(chalk.black.bgYellowBright(`---- Transaction executed: ${action._method.name} - Gas limit provided: ${gasLimit} ----`));
 
-<<<<<<< HEAD
     let nonce = await web3.eth.getTransactionCount(options.from.address);
-=======
-    let nonce = await web3.eth.getTransactionCount(from.address);
-      
-    if (nonce < minNonce) {
+    if (nonce < options.minNonce) {
       nonce = minNonce;
     }
->>>>>>> master-dev-2.1
     let abi = action.encodeABI();
     let parameter = {
       from: options.from.address,

CLI/commands/common/common_functions.js

@@ -3,8 +3,7 @@ const constants = require('./constants');
 
 global.web3, global.Issuer, global.defaultGasPrice, global.remoteNetwork;
 
-function getGasPrice (networkId) {
-<<<<<<< HEAD
+function getGasPrice(networkId) {
   let gasPrice;
   switch (networkId) {
     case 1: //Mainnet
@@ -24,25 +23,6 @@ function getGasPrice (networkId) {
   }
   return gasPrice;
 }
-=======
-    let gasPrice;
-    switch (networkId) {
-      case 1: //Mainnet
-        gasPrice = 20000000000;
-        break;
-      case 3: //Ropsten
-        gasPrice = 50000000000;
-        break;
-      case 15: //Ganache
-        gasPrice = 50000000000;
-        break;
-      case 42: //Kovan
-        gasPrice = 5000000000;
-        break;
-      default:
-        throw new Error('Network ID not identified');
-    }
->>>>>>> master-dev-2.1
 
 function providerValidator(url) {
   var expression = /https?:\/\/(www\.)?[-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,4}\b([-a-zA-Z0-9@:%_\+.~#?&//=]*)/g;
@@ -56,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') {