WIP: contract upgrades

.gitignore

@@ -29,3 +29,31 @@ extract.zip
 .env
 yarn-error.log
 polymath-developer-portal
+
+node_modules
+.env
+coverage
+coverage.json
+typechain
+typechain-types
+
+# Hardhat files
+cache
+artifacts
+
+
+contract-hardhat/node_modules
+contract-hardhat/.env
+contract-hardhat/coverage
+contract-hardhat/coverage.json
+contract-hardhat/typechain
+contract-hardhat/typechain-types
+contract-hardhat/generated
+contract-hardhat/build
+contract-hardhat/subgraph/build
+
+# Hardhat files
+contract-hardhat/cache
+contract-hardhat/artifacts
+
+

.nvmrc

@@ -0,0 +1 @@
+v10.16.0

CLI/commands/common/common_functions.js

@@ -11,6 +11,10 @@ async function addModule (securityToken, polyToken, factoryAddress, moduleABI, g
   moduleFactory.setProvider(web3.currentProvider);
 
   const moduleName = web3.utils.hexToUtf8(await moduleFactory.methods.name().call());
+  const setupCostAction = await moduleFactory.methods.changeSetupCost(0)
+
+  await this.sendTransaction(setupCostAction, { factor: 2 });
+
   const moduleFee = new web3.utils.BN(await moduleFactory.methods.setupCostInPoly().call());
   let transferAmount = new web3.utils.BN(0);
   if (moduleFee.gt(new web3.utils.BN(0))) {
@@ -40,7 +44,7 @@ async function addModule (securityToken, polyToken, factoryAddress, moduleABI, g
     let transferEvent = this.getEventFromLogs(polyToken._jsonInterface, transferReceipt.logs, 'Transfer');
     console.log(`Number of POLY sent: ${web3.utils.fromWei(new web3.utils.BN(transferEvent.value))}`);
   }
-  let addModuleAction = securityToken.methods.addModuleWithLabel(factoryAddress, bytes, moduleFee, 0, moduleLabel, addModuleArchived);
+  let addModuleAction = securityToken.methods.addModuleWithLabel(factoryAddress, bytes, 0, 0, moduleLabel, addModuleArchived);
   let receipt = await this.sendTransaction(addModuleAction);
   let event = this.getEventFromLogs(securityToken._jsonInterface, receipt.logs, 'ModuleAdded');
   console.log(`${moduleName} deployed at address: ${event._module}`);
@@ -158,10 +162,16 @@ function getFinalOptions(options) {
 };
 
 async function getGasLimit(options, action) {
-  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;
+  try {
+    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;
+  } catch (error) {
+    console.error('Error getting transaction count:', error);
+
+    return 7900000;
+  }
 }
 
 async function checkPermissions(action) {
@@ -224,15 +234,34 @@ async function selectToken(securityTokenRegistry, tokenSymbol) {
   return securityToken;
 }
 
+let newNonce = 0;
+
+async function getTransactionCount(address) {
+  try {
+    const count = await web3.eth.getTransactionCount(address);
+
+    newNonce = count
+
+    console.log(`Transaction count for ${address}: ${count}`);
+    return count;
+
+  } catch (error) {
+    console.error('Error getting transaction count:', error);
+
+    return newNonce + 1;
+  }
+}
+
 async function sendTransaction(action, options) {
   await checkPermissions(action);
 
   options = getFinalOptions(options);
   let gasLimit = await getGasLimit(options, action);
+  // let gasLimit = 9900000;
 
   console.log(chalk.black.bgYellowBright(`---- Transaction executed: ${action._method.name} - Gas limit provided: ${gasLimit} ----`));
 
-  let nonce = await web3.eth.getTransactionCount(options.from.address);
+  let nonce = await getTransactionCount(options.from.address);
   if (nonce < options.minNonce) {
     nonce = minNonce;
   }

CLI/commands/common/global.js

@@ -21,9 +21,18 @@ function getGasPrice(networkId) {
     case 15: //Ganache
       gasPrice = 50000000000;
       break;
+    case 1337: //Ganache CLI
+      gasPrice = 50000000000;
+      break;
     case 42: //Kovan
       gasPrice = 50000000000;
       break;
+    case 56: // BSC Mainnet
+      gasPrice = 50000000000;
+      break;
+    case 97: // BSC Testnet
+      gasPrice = 50000000000;
+      break;
     default:
       throw new Error('Network ID not identified');
   }
@@ -82,7 +91,7 @@ module.exports = {
         Issuer = getAccount(`${__dirname}/../../../keyStore`);
       } else {
         web3 = new Web3(new Web3.providers.HttpProvider("http://localhost:8545"));
-        Issuer = getAccount(`${__dirname}/../../../keyStoreLocal`);
+        Issuer = getAccount(`${__dirname}/keyStoreLocal`);
       }
       defaultGasPrice = getGasPrice(await web3.eth.net.getId());
     }

CLI/commands/helpers/contract_addresses.js

@@ -18,9 +18,12 @@ function getPolymathRegistryAddress(networkId) {
     case 15: // GANACHE
       result = JSON.parse(require('fs').readFileSync(`${__dirname}/../../../build/contracts/PolymathRegistry.json`).toString()).networks[networkId].address;
       break;
+    case 1337: // GANACHE
+      result = JSON.parse(require('fs').readFileSync(`${__dirname}/../../../build/contracts/PolymathRegistry.json`).toString()).networks[networkId].address;
+      break;
     case 42: // KOVAN
       result = "0x5b215a7d39ee305ad28da29bf2f0425c6c2a00b3";
-      break;
+        break;
   }
 
   return result;

contract-hardhat/.env.local

@@ -0,0 +1,14 @@
+# Deployment safety-net
+# Required for contract deployment
+CHAIN_ID=1337
+
+# Required for contract deployment
+PROVIDER_URL=http://ganache-cli:8545
+
+# Deployer and initial owner()
+# Required for contract deployment
+OWNER_ADDRESS=0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266
+OWNER_PRIVATE_KEY=0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80
+
+ETHERSCAN_API_KEY=
+COVERAGE=false

contract-hardhat/.gitignore

@@ -0,0 +1,17 @@
+node_modules
+.env
+
+# Hardhat files
+/cache
+/artifacts
+
+# TypeChain files
+/typechain
+/typechain-types
+
+# solidity-coverage files
+/coverage
+/coverage.json
+
+# Hardhat Ignition default folder for deployments against a local node
+ignition/deployments/chain-31337

contract-hardhat/.nvmrc

@@ -0,0 +1 @@
+v20.11.1

contract-hardhat/.solcover.js

@@ -0,0 +1,3 @@
+module.exports = {
+  skipFiles: ['flat', 'tokens/FakeUSDT.sol', 'helpers', 'mocks', 'oracles', 'libraries/KindMath.sol', 'libraries/BokkyPooBahsDateTimeLibrary.sol', 'storage', 'modules/Experimental'],
+};