Merge pull request #31 from gnosis/update-lockfile2

Upgrade NPM packages
gnosis · Aug 21, 2017 · 059adb7 · 059adb7
2 parents aef17cc + 49f671c
commit 059adb7
Show file tree

Hide file tree

Showing 34 changed files with 358 additions and 375 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,7 +8,7 @@ before_install:
 - npm install -g npm codecov greenkeeper-lockfile@1
 before_script: greenkeeper-lockfile-update
 script:
-- npm run coverage
+- travis_wait npm run coverage
 - codecov
 after_script: greenkeeper-lockfile-upload
 before_deploy:

diff --git a/contracts/Events/CategoricalEvent.sol b/contracts/Events/CategoricalEvent.sol
@@ -1,4 +1,4 @@
-pragma solidity 0.4.13;
+pragma solidity 0.4.15;
 import "../Events/Event.sol";
 
 

diff --git a/contracts/Events/Event.sol b/contracts/Events/Event.sol
@@ -1,4 +1,4 @@
-pragma solidity 0.4.13;
+pragma solidity 0.4.15;
 import "../Tokens/Token.sol";
 import "../Tokens/OutcomeToken.sol";
 import "../Oracles/Oracle.sol";

diff --git a/contracts/Events/EventFactory.sol b/contracts/Events/EventFactory.sol
@@ -1,4 +1,4 @@
-pragma solidity 0.4.13;
+pragma solidity 0.4.15;
 import "../Events/CategoricalEvent.sol";
 import "../Events/ScalarEvent.sol";
 

diff --git a/contracts/Events/ScalarEvent.sol b/contracts/Events/ScalarEvent.sol
@@ -1,4 +1,4 @@
-pragma solidity 0.4.13;
+pragma solidity 0.4.15;
 import "../Events/Event.sol";
 
 

diff --git a/contracts/MarketMakers/LMSRMarketMaker.sol b/contracts/MarketMakers/LMSRMarketMaker.sol
@@ -1,4 +1,4 @@
-pragma solidity 0.4.13;
+pragma solidity 0.4.15;
 import "../Utils/Math.sol";
 import "../MarketMakers/MarketMaker.sol";
 

diff --git a/contracts/MarketMakers/MarketMaker.sol b/contracts/MarketMakers/MarketMaker.sol
@@ -1,4 +1,4 @@
-pragma solidity 0.4.13;
+pragma solidity 0.4.15;
 import "../Markets/Market.sol";
 
 

diff --git a/contracts/Markets/Campaign.sol b/contracts/Markets/Campaign.sol
@@ -1,4 +1,4 @@
-pragma solidity 0.4.13;
+pragma solidity 0.4.15;
 import "../Events/Event.sol";
 import "../Markets/StandardMarketFactory.sol";
 import "../Utils/Math.sol";

diff --git a/contracts/Markets/CampaignFactory.sol b/contracts/Markets/CampaignFactory.sol
@@ -1,4 +1,4 @@
-pragma solidity 0.4.13;
+pragma solidity 0.4.15;
 import "../Markets/Campaign.sol";
 
 

diff --git a/contracts/Markets/Market.sol b/contracts/Markets/Market.sol
@@ -1,4 +1,4 @@
-pragma solidity 0.4.13;
+pragma solidity 0.4.15;
 import "../Events/Event.sol";
 import "../MarketMakers/MarketMaker.sol";
 

diff --git a/contracts/Markets/MarketFactory.sol b/contracts/Markets/MarketFactory.sol
@@ -1,4 +1,4 @@
-pragma solidity 0.4.13;
+pragma solidity 0.4.15;
 import "../Events/Event.sol";
 import "../MarketMakers/MarketMaker.sol";
 import "../Markets/Market.sol";

diff --git a/contracts/Markets/StandardMarket.sol b/contracts/Markets/StandardMarket.sol
@@ -1,4 +1,4 @@
-pragma solidity 0.4.13;
+pragma solidity 0.4.15;
 import "../Markets/Market.sol";
 import "../Tokens/Token.sol";
 import "../Events/Event.sol";

diff --git a/contracts/Markets/StandardMarketFactory.sol b/contracts/Markets/StandardMarketFactory.sol
@@ -1,4 +1,4 @@
-pragma solidity 0.4.13;
+pragma solidity 0.4.15;
 import "../Markets/MarketFactory.sol";
 import "../Markets/StandardMarket.sol";
 

diff --git a/contracts/Oracles/CentralizedOracle.sol b/contracts/Oracles/CentralizedOracle.sol
@@ -1,4 +1,4 @@
-pragma solidity 0.4.13;
+pragma solidity 0.4.15;
 import "../Oracles/Oracle.sol";
 
 

diff --git a/contracts/Oracles/CentralizedOracleFactory.sol b/contracts/Oracles/CentralizedOracleFactory.sol
@@ -1,4 +1,4 @@
-pragma solidity 0.4.13;
+pragma solidity 0.4.15;
 import "../Oracles/CentralizedOracle.sol";
 
 

diff --git a/contracts/Oracles/DifficultyOracle.sol b/contracts/Oracles/DifficultyOracle.sol
@@ -1,4 +1,4 @@
-pragma solidity 0.4.13;
+pragma solidity 0.4.15;
 import "../Oracles/Oracle.sol";
 
 

diff --git a/contracts/Oracles/DifficultyOracleFactory.sol b/contracts/Oracles/DifficultyOracleFactory.sol
@@ -1,4 +1,4 @@
-pragma solidity 0.4.13;
+pragma solidity 0.4.15;
 import "../Oracles/DifficultyOracle.sol";
 
 

diff --git a/contracts/Oracles/FutarchyOracle.sol b/contracts/Oracles/FutarchyOracle.sol
@@ -1,4 +1,4 @@
-pragma solidity 0.4.13;
+pragma solidity 0.4.15;
 import "../Oracles/Oracle.sol";
 import "../Events/EventFactory.sol";
 import "../Markets/MarketFactory.sol";

diff --git a/contracts/Oracles/FutarchyOracleFactory.sol b/contracts/Oracles/FutarchyOracleFactory.sol
@@ -1,4 +1,4 @@
-pragma solidity 0.4.13;
+pragma solidity 0.4.15;
 import "../Oracles/FutarchyOracle.sol";
 
 

diff --git a/contracts/Oracles/MajorityOracle.sol b/contracts/Oracles/MajorityOracle.sol
@@ -1,4 +1,4 @@
-pragma solidity 0.4.13;
+pragma solidity 0.4.15;
 import "../Oracles/Oracle.sol";
 
 

diff --git a/contracts/Oracles/MajorityOracleFactory.sol b/contracts/Oracles/MajorityOracleFactory.sol
@@ -1,4 +1,4 @@
-pragma solidity 0.4.13;
+pragma solidity 0.4.15;
 import "../Oracles/MajorityOracle.sol";
 
 

diff --git a/contracts/Oracles/Oracle.sol b/contracts/Oracles/Oracle.sol
@@ -1,4 +1,4 @@
-pragma solidity 0.4.13;
+pragma solidity 0.4.15;
 
 
 /// @title Abstract oracle contract - Functions to be implemented by oracles

diff --git a/contracts/Oracles/SignedMessageOracle.sol b/contracts/Oracles/SignedMessageOracle.sol
@@ -1,4 +1,4 @@
-pragma solidity 0.4.13;
+pragma solidity 0.4.15;
 import "../Oracles/Oracle.sol";
 
 

diff --git a/contracts/Oracles/SignedMessageOracleFactory.sol b/contracts/Oracles/SignedMessageOracleFactory.sol
@@ -1,4 +1,4 @@
-pragma solidity 0.4.13;
+pragma solidity 0.4.15;
 import "../Oracles/SignedMessageOracle.sol";
 
 

diff --git a/contracts/Oracles/UltimateOracle.sol b/contracts/Oracles/UltimateOracle.sol
@@ -1,4 +1,4 @@
-pragma solidity 0.4.13;
+pragma solidity 0.4.15;
 import "../Oracles/Oracle.sol";
 import "../Tokens/Token.sol";
 import "../Utils/Math.sol";

diff --git a/contracts/Oracles/UltimateOracleFactory.sol b/contracts/Oracles/UltimateOracleFactory.sol
@@ -1,4 +1,4 @@
-pragma solidity 0.4.13;
+pragma solidity 0.4.15;
 import "../Oracles/UltimateOracle.sol";
 
 

diff --git a/contracts/Tokens/EtherToken.sol b/contracts/Tokens/EtherToken.sol
@@ -1,4 +1,4 @@
-pragma solidity 0.4.13;
+pragma solidity 0.4.15;
 import "../Tokens/StandardToken.sol";
 
 

diff --git a/contracts/Tokens/OutcomeToken.sol b/contracts/Tokens/OutcomeToken.sol
@@ -1,4 +1,4 @@
-pragma solidity 0.4.13;
+pragma solidity 0.4.15;
 import "../Tokens/StandardToken.sol";
 
 

diff --git a/contracts/Tokens/StandardToken.sol b/contracts/Tokens/StandardToken.sol
@@ -1,4 +1,4 @@
-pragma solidity 0.4.13;
+pragma solidity 0.4.15;
 import "../Tokens/Token.sol";
 import "../Utils/Math.sol";
 

diff --git a/contracts/Tokens/Token.sol b/contracts/Tokens/Token.sol
@@ -1,5 +1,5 @@
 /// Implements ERC 20 Token standard: https://github.com/ethereum/EIPs/issues/20
-pragma solidity 0.4.13;
+pragma solidity 0.4.15;
 
 
 /// @title Abstract token contract - Functions to be implemented by token contracts

diff --git a/contracts/Utils/Math.sol b/contracts/Utils/Math.sol
@@ -1,4 +1,4 @@
-pragma solidity 0.4.13;
+pragma solidity 0.4.15;
 
 
 /// @title Math library - Allows calculation of logarithmic and exponential functions