Removed Mint method

contracts/Core/StakeManager.sol

@@ -228,7 +228,7 @@ contract StakeManager is Initializable, ACL, StakeStorage {
         if (blockReward > 0) {
             uint256 newStake = stakers[stakerId].stake+(blockReward);
             _setStakerStake(stakerId, newStake, "Block Reward", epoch);
-            require(sch.mint(address(this), blockReward));
+
         }
         uint256 prevStakeGettingReward = stakeGettingReward;
         stakeGettingReward = 0;

contracts/SchellingCoin.sol

@@ -21,9 +21,9 @@ contract SchellingCoin is ERC20, ACL {
     /**
      * @dev Constructor that gives msg.sender all of existing tokens.
      */
-    constructor (address minter) ERC20("SchellingCoin", "SCH") {
+    constructor () ERC20("SchellingCoin", "SCH") {
         _mint(msg.sender, INITIAL_SUPPLY);
-        grantRole(MINTER_ROLE, minter);
+
     }
 
     function addMinter(address account) external {

migrations/src/8_deploy_schelling_coin_and_faucet.js

@@ -2,14 +2,12 @@ const { NETWORK, SCHELLING_COIN_ADDRESS } = process.env;
 const {
   deployContract,
   appendDeploymentFile,
-  readDeploymentFile,
   readOldDeploymentFile,
 } = require('../migrationHelpers');
 
 const deploySchellingCoinAndFaucet = async () => {
   if (NETWORK !== 'mainnet' && SCHELLING_COIN_ADDRESS === '') {
-    const { StateManager } = await readDeploymentFile();
-    const schellingCoin = await deployContract('SchellingCoin', [], [StateManager]);
+    const schellingCoin = await deployContract('SchellingCoin', [], []);
     await deployContract('Faucet', [], [schellingCoin.address]);
   } else {
     const { Faucet, SchellingCoin } = await readOldDeploymentFile();

migrations/src/postDeploymentSetup.js

@@ -1,9 +1,9 @@
 const {
   getdeployedContractInstance,
   readDeploymentFile,
-  readOldDeploymentFile,
 } = require('../migrationHelpers');
 
+const { BigNumber } = ethers;
 const {
   NETWORK,
   SCHELLING_COIN_ADDRESS,
@@ -44,22 +44,25 @@ module.exports = async () => {
   // Only transfer tokens in testnets
   if (NETWORK !== 'mainnet') {
     // Add new instance of StakeManager contract & Deployer address as Minter
-    await schellingCoin.addMinter(stakeManagerAddress);
-    await schellingCoin.addMinter(signers[0].address);
 
-    if (SCHELLING_COIN_ADDRESS !== '') {
-      const { StakeManager: oldStakeManagerAddress } = await readOldDeploymentFile();
+    const initialSupply = await schellingCoin.INITIAL_SUPPLY();
+
+    const mintableSupply = (BigNumber.from(10).pow(BigNumber.from(26))).mul(BigNumber.from(6));
+    const deployerBalance = BigNumber.from(await schellingCoin.balanceOf(signers[0].address));
+    const deployerSupply = BigNumber.from(initialSupply).sub(BigNumber.from(deployerBalance));
 
+    if (SCHELLING_COIN_ADDRESS !== '') {
       // if previous instances of Schelling Coin is reused again and again,
       // then initial balance will get depleted, thus intial tokens minting is needed,
       // each time Schelling Coin instance is reused
-      const initialSupply = await schellingCoin.INITIAL_SUPPLY();
-      await schellingCoin.mint(signers[0].address, initialSupply);
+      await schellingCoin.addMinter(signers[0].address);
+
+      await schellingCoin.mint(signers[0].address, (deployerSupply));
 
-      // Remove previous instance of StakeManager contract & Deployer address from Minter
-      await schellingCoin.removeMinter(oldStakeManagerAddress);
+      // Remove previous instance of  Deployer address from Minter
       await schellingCoin.removeMinter(signers[0].address);
     }
+    await schellingCoin.transfer(stakeManagerAddress, mintableSupply);
 
     for (let i = 0; i < stakerAddressList.length; i++) {
       const tx = await schellingCoin.transfer(stakerAddressList[i], SEED_AMOUNT);

test/helpers/testSetup.js

@@ -53,7 +53,7 @@ const setupContracts = async () => {
   const jobManager = await JobManager.deploy(stateManager.address);
   const stakeManager = await StakeManager.deploy(BLOCK_REWARD.toHexString());
   const voteManager = await VoteManager.deploy();
-  const schellingCoin = await SchellingCoin.deploy(stakeManager.address);
+  const schellingCoin = await SchellingCoin.deploy();
   const faucet = await Faucet.deploy(schellingCoin.address);
 
   await blockManager.deployed();