[ Closes #66 ] Update dependencies

.travis.yml

@@ -4,12 +4,12 @@ services:
   - docker
 
 before_install:
-  - docker-compose build
+  - docker-compose build --no-cache
 
 script:
 #wait for 1 minute first as oracle container need to deploy connector contracts
   - docker-compose run --rm workspace sh -c "sleep 60 && yarn && truffle test"
   - docker-compose down
 notifications:
   slack:
-    secure: KfTgWBeQa55Gad9ULcDbnyat24eayLgR57HcO7P2mX2T93DuHmXC0WEiZlAwY+Uq2AFxedF3/DX5sh5DYcwCFlTztP4OyHOl1+f5iRMQugvUQmisH2lhwbMY0D7jCDjEDFf7XPVAxusx3I7gFPZbkG1bXZLzEMsmLhz7lr1BHRcoApcaQ9cJ+tjNgGMsfqqQjjlqeuNM5BqrYREble/8IGZutTxtSzQeroFWifiIBEAwTiL1f+0jFgZHApOpofQl8Qe0M+JOmSUO5coW9F++s7nVieyccceL/cVtR0pTmy8VFX/M2ppnBZYPGmgERp40wydnX4QMmfkc7FQScdswaZqViGYnSGd/nvOjjGwQICoW6+1bcNPkfFYNn6Vsd2VTHtGgxkSxVTVjPhXqR1iTJp3Jl00VdubPzAVqzvaw6/ZWjANPD8+YlQ1KRLkXN515wK7R84vzYJmLJ6Ndh1t1cq6lBCcHfo2QIZh19keuxKZqL52dgEHNBCJ/txjhGNkI5/6oOpAMZrZfuwy4Ln8bq3DUzpRa6hn8jN/rxzcj6M04zJLp8gIJB27SIiOvD2EJtlEwzUxq3PsUIvcWTFF/9MrmMK7lCVoL4LCV2TVAFq8eVxB84OYJY9DtXgFMdiS7xUMph4M23T66w3e7mWMmGTI5D1zyw8WawFzCOnyH378=
+    secure: KfTgWBeQa55Gad9ULcDbnyat24eayLgR57HcO7P2mX2T93DuHmXC0WEiZlAwY+Uq2AFxedF3/DX5sh5DYcwCFlTztP4OyHOl1+f5iRMQugvUQmisH2lhwbMY0D7jCDjEDFf7XPVAxusx3I7gFPZbkG1bXZLzEMsmLhz7lr1BHRcoApcaQ9cJ+tjNgGMsfqqQjjlqeuNM5BqrYREble/8IGZutTxtSzQeroFWifiIBEAwTiL1f+0jFgZHApOpofQl8Qe0M+JOmSUO5coW9F++s7nVieyccceL/cVtR0pTmy8VFX/M2ppnBZYPGmgERp40wydnX4QMmfkc7FQScdswaZqViGYnSGd/nvOjjGwQICoW6+1bcNPkfFYNn6Vsd2VTHtGgxkSxVTVjPhXqR1iTJp3Jl00VdubPzAVqzvaw6/ZWjANPD8+YlQ1KRLkXN515wK7R84vzYJmLJ6Ndh1t1cq6lBCcHfo2QIZh19keuxKZqL52dgEHNBCJ/txjhGNkI5/6oOpAMZrZfuwy4Ln8bq3DUzpRa6hn8jN/rxzcj6M04zJLp8gIJB27SIiOvD2EJtlEwzUxq3PsUIvcWTFF/9MrmMK7lCVoL4LCV2TVAFq8eVxB84OYJY9DtXgFMdiS7xUMph4M23T66w3e7mWMmGTI5D1zyw8WawFzCOnyH378=

contracts/BtcPriceProvider.sol

@@ -2,7 +2,8 @@ pragma solidity ^0.4.0;
 import "./abstract/PriceProvider.sol";
 
 contract BtcPriceProvider is PriceProvider {
-  function BtcPriceProvider() PriceProvider("json(https://api.kraken.com/0/public/Ticker?pair=XBTUSD).result.XXBTZUSD.c.0") {
+
+  function BtcPriceProvider() public PriceProvider("json(https://api.kraken.com/0/public/Ticker?pair=XBTUSD).result.XXBTZUSD.c.0") {
 
   }
 

contracts/Burnable.sol

@@ -1,5 +1,5 @@
 pragma solidity ^0.4.11;
-import "zeppelin-solidity/contracts/token/StandardToken.sol";
+import "zeppelin-solidity/contracts/token/ERC20/StandardToken.sol";
 
 /**
  * @title Burnable
@@ -15,7 +15,7 @@ contract Burnable is StandardToken {
   function burn(uint _value) returns (bool success) {
     require(_value > 0 && balances[msg.sender] >= _value);
     balances[msg.sender] = balances[msg.sender].sub(_value);
-    totalSupply = totalSupply.sub(_value);
+    totalSupply_ = totalSupply_.sub(_value);
     Burn(msg.sender, _value);
     return true;
   }
@@ -24,7 +24,7 @@ contract Burnable is StandardToken {
     require(_from != 0x0 && _value > 0 && balances[_from] >= _value);
     require(_value <= allowed[_from][msg.sender]);
     balances[_from] = balances[_from].sub(_value);
-    totalSupply = totalSupply.sub(_value);
+    totalSupply_ = totalSupply_.sub(_value);
     allowed[_from][msg.sender] = allowed[_from][msg.sender].sub(_value);
     Burn(_from, _value);
     return true;

contracts/JincorToken.sol

@@ -50,7 +50,7 @@ contract JincorToken is Burnable, Ownable {
    * @dev Constructor that gives msg.sender all of existing tokens.
    */
   function JincorToken() {
-    totalSupply = INITIAL_SUPPLY;
+    totalSupply_ = INITIAL_SUPPLY;
     balances[msg.sender] = INITIAL_SUPPLY;
   }
 

contracts/abstract/PriceProvider.sol

@@ -41,15 +41,15 @@ contract PriceProvider is Ownable, usingOraclize {
     _;
   }
 
-  function PriceProvider(string _url) {
+  function PriceProvider(string _url) public {
     url = _url;
 
     //update immediately first time to be sure everything is working - first oraclize request is free.
     update(0);
   }
 
   //send some funds along with the call to cover oraclize fees
-  function startUpdate(uint startingPrice) payable onlyOwner inStoppedState {
+  function startUpdate(uint startingPrice) external payable onlyOwner inStoppedState {
     state = State.Active;
 
     //we can set starting price manually, contract will notify watcher only in case of allowed diff
@@ -77,7 +77,7 @@ contract PriceProvider is Ownable, usingOraclize {
     url = newUrl;
   }
 
-  function __callback(bytes32 myid, string result, bytes proof) {
+  function __callback(bytes32 myid, string result, bytes proof) public {
     require(msg.sender == oraclize_cbAddress() && validIds[myid]);
     delete validIds[myid];