Merge pull request #11 from singnet/token/updates

Token/updates

Author: tiero

contracts/tokens/SingularityNetToken.sol

@@ -23,13 +23,13 @@ import "zeppelin-solidity/contracts/token/BurnableToken.sol";
  */
 contract SingularityNetToken is PausableToken, BurnableToken {
 
-    string public constant NAME = "SingularityNET Token";
-    string public constant SYMBOL = "AGI";
-    uint8 public constant DECIMALS = 8;
-    uint256 public constant INITIAL_SUPPLY = 1000000000 * 10**uint256(DECIMALS);
-    uint256 public constant PRIVATE_SUPPLY =  100000000 * 10**uint256(DECIMALS);
-    uint256 public constant FOUNDER_SUPPLY =  500000000 * 10**uint256(DECIMALS); 
-    uint256 public constant PUBLIC_SUPPLY  =  400000000 * 10**uint256(DECIMALS);
+    string public constant name = "SingularityNET Token";
+    string public constant symbol = "AGI";
+    uint8 public constant decimals = 8;
+    uint256 public constant INITIAL_SUPPLY = 1000000000 * 10**uint256(decimals);
+    uint256 public constant PRIVATE_SUPPLY =  350000000 * 10**uint256(decimals);
+    uint256 public constant FOUNDER_SUPPLY =  500000000 * 10**uint256(decimals); 
+    uint256 public constant PUBLIC_SUPPLY  =  150000000 * 10**uint256(decimals);
 
     /**
     * @dev SingularityNetToken Constructor
@@ -40,17 +40,6 @@ contract SingularityNetToken is PausableToken, BurnableToken {
         balances[msg.sender] = INITIAL_SUPPLY;
     }
 
-    function setOwnership(address _owner) onlyOwner {
-        require(_owner != owner);
-        require(address(_owner) != address(0));
-        pause();
-        //assign to current owner 
-        balances[owner] = INITIAL_SUPPLY.sub(PUBLIC_SUPPLY);
-        transferOwnership(_owner);
-        require(_owner == owner);        
-        balances[owner] = PUBLIC_SUPPLY;
-    } 
-
     function transferTokens(address beneficiary, uint256 amount) onlyOwner returns (bool) {
         require(amount > 0);
 

test/TestAgiCrowdsale.js

@@ -1,6 +1,7 @@
 const Crowdsale = artifacts.require('./helpers/AgiCrowdsale.sol')
 const AGIToken = artifacts.require('SingularityNetToken.sol')
 const Vault = artifacts.require('RefundVault.sol')
+const PUBLIC_SUPPLY = new web3.BigNumber(150000000 *  Math.pow(10, 8))
 
 const { latestTime, duration } = require('./helpers/latestTime')
 const { increaseTimeTo } = require('./helpers/increaseTime')
@@ -22,7 +23,9 @@ contract('AgiCrowdsale', async ([miner, firstContributor, secondContributor, whi
     this.token = await AGIToken.new({ from: miner })
     this.agiCrowdsale = await Crowdsale.new(this.token.address, wallet, startTime, endTime, rate, cap, firstDayCap, goal, { from: miner })
 
-    await this.token.setOwnership(this.agiCrowdsale.address)
+    await this.token.transfer(this.agiCrowdsale.address, PUBLIC_SUPPLY, {from:miner})
+    await this.token.pause()
+    await this.token.transferOwnership(this.agiCrowdsale.address)
     await this.agiCrowdsale.updateWhitelist([firstContributor, secondContributor], true)
   })
 
@@ -62,8 +65,8 @@ contract('AgiCrowdsale', async ([miner, firstContributor, secondContributor, whi
     })
 
     it('check the balances just after deploy and after crowdsale initialization', async () => {
-      assert.equal((await this.token.balanceOf(miner)).toNumber(), 600000000 * 10**8, "The miner should hold 600mil")
-      assert.equal((await this.token.balanceOf(this.agiCrowdsale.address)).toNumber(), 400000000 * 10**8, "The Crowdsale should hold 400mil")
+      assert.equal((await this.token.balanceOf(miner)).toNumber(), 850000000 * 10**8, "The miner should hold 600mil")
+      assert.equal((await this.token.balanceOf(this.agiCrowdsale.address)).toNumber(), 150000000 * 10**8, "The Crowdsale should hold 400mil")
     })  
 
   })
@@ -271,6 +274,8 @@ contract('AgiCrowdsale', async ([miner, firstContributor, secondContributor, whi
       await increaseTimeTo(latestTime() + duration.weeks(2))
 
       await this.agiCrowdsale.finalize()    
+      await this.agiCrowdsale.transferOwnership(miner)
+      
 
       assert.isTrue(await this.agiCrowdsale.isFinalized.call())
 
@@ -291,6 +296,7 @@ contract('AgiCrowdsale', async ([miner, firstContributor, secondContributor, whi
 
       await increaseTimeTo(latestTime() + duration.weeks(2))
       await this.agiCrowdsale.finalize()
+      await this.agiCrowdsale.transferOwnership(miner)
 
       const before = web3.fromWei(web3.eth.getBalance(firstContributor), 'ether')
 
@@ -304,6 +310,8 @@ contract('AgiCrowdsale', async ([miner, firstContributor, secondContributor, whi
       await increaseTimeTo(latestTime() + duration.weeks(2))
 
       await this.agiCrowdsale.finalize()
+      await this.agiCrowdsale.transferOwnership(miner)
+      
 
       const initialSupply = await this.token.balanceOf(this.agiCrowdsale.address)
       const balanceBeforeClaim = await this.token.balanceOf(miner)
@@ -327,6 +335,7 @@ contract('AgiCrowdsale', async ([miner, firstContributor, secondContributor, whi
       await increaseTimeTo(latestTime() + duration.weeks(2))
 
       await this.agiCrowdsale.finalize()
+      await this.agiCrowdsale.transferOwnership(miner)      
 
       assert.isFalse(await this.token.paused.call(), 'token should be unpaused')
     })

test/TestSingularityNetToken.js

@@ -1,5 +1,7 @@
 const SingularityNetToken = artifacts.require('./helpers/SingularityNetToken.sol')
 const Crowdsale = artifacts.require('./helpers/AgiCrowdsale.sol')
+const PUBLIC_SUPPLY = new web3.BigNumber(150000000 *  Math.pow(10, 8))
+
 
 const assertFail = require('./helpers/assertFail.js')
 const { increaseTimeTo } = require('./helpers/increaseTime')
@@ -12,15 +14,15 @@ contract('SingularityNetToken', (accounts) => {
   })
 
   it('should have the name Singularity Network Token', async () => {
-    assert.equal(await this.token.NAME.call(), 'SingularityNET Token', "Singularity Network Token wasn't the name")
+    assert.equal(await this.token.name.call(), 'SingularityNET Token', "Singularity Network Token wasn't the name")
   })
 
   it('should have the symbol AGI', async () => {
-    assert.equal(await this.token.SYMBOL.call(), 'AGI', "AGI wasn't the symbol")
+    assert.equal(await this.token.symbol.call(), 'AGI', "AGI wasn't the symbol")
   })
 
   it('should have decimals set to 8', async () => {
-    assert.equal(await this.token.DECIMALS.call(), 8, "8 wasn't the value of decimals")
+    assert.equal(await this.token.decimals.call(), 8, "8 wasn't the value of decimals")
   })
 
   it('should have INITIAL_SUPPLY set to 1e17 cogs', async () => {
@@ -46,12 +48,12 @@ contract('SingularityNetToken', (accounts) => {
     await increaseTimeTo(startTime + duration.days(1))
 
     //should be the new owner and start the sale
-    await this.token.setOwnership(agiCrowdsale.address)
+    await this.token.transfer(agiCrowdsale.address, PUBLIC_SUPPLY, {from:accounts[0]})
+    await this.token.pause()
+    await this.token.transferOwnership(agiCrowdsale.address)
     //Check the new token owner
     assert.equal(await this.token.owner.call(), agiCrowdsale.address, 'Crowdsale is not the owner of the token')
-    //Check the balances
-    const balanceAfter = await this.token.balanceOf(miner)
-    const balanceOfCrowdsale = await this.token.balanceOf(agiCrowdsale.address)
+ 
   })
 
 
@@ -104,10 +106,10 @@ contract('SingularityNetToken', (accounts) => {
     await increaseTimeTo(startTime + duration.days(1))
 
     // First time should be ok
-    await this.token.setOwnership(agiCrowdsale.address)
+    await this.token.transferOwnership(agiCrowdsale.address)
 
     // Callisg anthoer time, not
-    await assertFail(async () => await this.token.setOwnership(agiCrowdsale.address), 'should have thrown before')
+    await assertFail(async () => await this.token.transferOwnership(agiCrowdsale.address), 'should have thrown before')
   })
 
   it('should transfer tokens to someone if owner', async () => {