Bug fixes

src/bitcoin/.gitignore

@@ -0,0 +1,2 @@
+node_modules/
+.idea/

src/dapp/public/address.json

@@ -1 +1 @@
-{"PreICO":{"address":"0x9c93e04b548f85c84f59b99a8a492a7b08432357"}}
+{"PreICO":{"address":"0x7089715e4ac29a50bdade2a640d74a212064c1cd"}}

src/truffle/contracts/DelegateOwner.sol

@@ -10,7 +10,7 @@ contract DelegateOwner is Ownable {
         return true;
     }
 
-    function removeDelegate(address delegate) returns (bool) {
+    function removeDelegate(address delegate) onlyOwner returns (bool) {
         delete delegates[delegate];
         return true;
     }

src/truffle/contracts/PreICO.sol

@@ -28,6 +28,7 @@ contract PreICO is DelegateableOwnerToken {
     }
 
     function claimOwnership() onlyPendingOwner public {
+        // TODO: Check ORDER!!!!
         uint256 ownerBalance = balances[owner];
         balances[owner] = 0;
         balances[pendingOwner] = ownerBalance;

src/truffle/test/DelegateOwner.js

@@ -23,7 +23,7 @@ contract("DelegateOwner", function (accounts) {
         it("should fail if it's not the owner", async function() {
             var error = false;
             try {
-                await ico.addDelegate(user, { from: account[1] });
+                await ico.addDelegate(user, { from: accounts[1] });
             } catch(e) {
                 error = true;
             }
@@ -47,7 +47,7 @@ contract("DelegateOwner", function (accounts) {
         it("should fail if it's not the owner", async function() {
             var error = false;
             try {
-                await ico.removeDelegate(user, { from: account[1] });
+                await ico.removeDelegate(user, { from: accounts[1] });
             } catch(e) {
                 error = true;
             }

src/truffle/test/DelegateableOwnerToken.js

@@ -24,7 +24,7 @@ contract("DelegatableOwnerToken", function (accounts) {
         it("should fail if it's not the owner", async function() {
             var error = false;
             try {
-                await ico.addDelegate(user, { from: account[1] });
+                await ico.addDelegate(user, { from: accounts[1] });
             } catch(e) {
                 error = true;
             }
@@ -48,7 +48,7 @@ contract("DelegatableOwnerToken", function (accounts) {
         it("should fail if it's not the owner", async function() {
             var error = false;
             try {
-                await ico.removeDelegate(user, { from: account[1] });
+                await ico.removeDelegate(user, { from: accounts[1] });
             } catch(e) {
                 error = true;
             }

src/truffle/test/Whitelist.js

@@ -118,19 +118,22 @@ contract("Whitelist", function(accounts) {
 
         it("should fail calling transfer", async function () {
             var error = false;
+            await ico.enableWhitelist({ from: owner });
+            await ico.removeFromWhitelist(userAddress);
             try {
-                ico.transfer(account[3], 33, { from: userAddress });
+                await ico.transfer(accounts[3], 33, { from: userAddress });
+                console.log("I did ok");
             } catch(e) {
                 error = true;
             }
-
+            
             assert.isTrue(error, "an exception should have been thrown");
         });
 
         it("should fail calling transferFrom", async function () {
             var error = false;
             try {
-                ico.transferFrom(account[3], account[3], 33, { from: userAddress });
+                await ico.transferFrom(accounts[3], accounts[3], 33, { from: userAddress });
             } catch(e) {
                 error = true;
             }
@@ -141,7 +144,7 @@ contract("Whitelist", function(accounts) {
         it("should fail calling approve", async function () {
             var error = false;
             try {
-                ico.transferFrom(account[3], 33, { from: userAddress });
+                await ico.transferFrom(accounts[3], 33, { from: userAddress });
             } catch(e) {
                 error = true;
             }
@@ -152,7 +155,7 @@ contract("Whitelist", function(accounts) {
         it("should fail calling increaseApproval", async function () {
             var error = false;
             try {
-                ico.increaseApproval(account[3], 33, { from: userAddress });
+                await ico.increaseApproval(accounts[3], 33, { from: userAddress });
             } catch(e) {
                 error = true;
             }
@@ -163,7 +166,7 @@ contract("Whitelist", function(accounts) {
         it("should fail calling decreaseApproval", async function () {
             var error = false;
             try {
-                ico.decreaseApproval(account[3], 33, { from: userAddress });
+                await ico.decreaseApproval(accounts[3], 33, { from: userAddress });
             } catch(e) {
                 error = true;
             }