Merge pull request #274 from Loopring/version1.2

Version1.2
LoopringSecondary · Mar 9, 2018 · c9e0347 · c9e0347
2 parents 8b0880b + 23fd59c
commit c9e0347
Show file tree

Hide file tree

Showing 17 changed files with 40 additions and 3,311 deletions.
diff --git a/contracts/LoopringProtocol.sol b/contracts/LoopringProtocol.sol
@@ -15,7 +15,7 @@
   limitations under the License.
 
 */
-pragma solidity 0.4.18;
+pragma solidity 0.4.19;
 
 
 /// @title Loopring Token Exchange Protocol Contract Interface

diff --git a/contracts/LoopringProtocolImpl.sol b/contracts/LoopringProtocolImpl.sol
@@ -15,7 +15,7 @@
   limitations under the License.
 
 */
-pragma solidity 0.4.18;
+pragma solidity 0.4.19;
 
 import "./lib/ERC20.sol";
 import "./lib/MathBytes32.sol";

diff --git a/contracts/Migrations.sol b/contracts/Migrations.sol
@@ -1,4 +1,4 @@
-pragma solidity 0.4.18;
+pragma solidity 0.4.19;
 
 
 contract Migrations {

diff --git a/contracts/NameRegistry.sol b/contracts/NameRegistry.sol
@@ -15,7 +15,7 @@
   limitations under the License.
 
 */
-pragma solidity 0.4.18;
+pragma solidity 0.4.19;
 
 
 /// @title Ethereum Address Register Contract

diff --git a/contracts/TokenRegistry.sol b/contracts/TokenRegistry.sol
@@ -15,7 +15,7 @@
   limitations under the License.
 
 */
-pragma solidity 0.4.18;
+pragma solidity 0.4.19;
 
 import "./lib/Claimable.sol";
 

diff --git a/contracts/TokenTransferDelegate.sol b/contracts/TokenTransferDelegate.sol
@@ -15,7 +15,7 @@
   limitations under the License.
 
 */
-pragma solidity 0.4.18;
+pragma solidity 0.4.19;
 
 import "./lib/ERC20.sol";
 import "./lib/MathUint.sol";

diff --git a/contracts/TransferableMultsig.sol b/contracts/TransferableMultsig.sol
@@ -15,7 +15,7 @@
   limitations under the License.
 
 */
-pragma solidity 0.4.18;
+pragma solidity 0.4.19;
 
 
 /// @title Transferable Multisignature Contract

diff --git a/contracts/lib/Claimable.sol b/contracts/lib/Claimable.sol
@@ -15,7 +15,7 @@
   limitations under the License.
 
 */
-pragma solidity 0.4.18;
+pragma solidity 0.4.19;
 
 import "./Ownable.sol";
 
@@ -45,4 +45,4 @@ contract Claimable is Ownable {
         owner = pendingOwner;
         pendingOwner = 0x0;
     }
-}
+}
diff --git a/contracts/lib/ERC20.sol b/contracts/lib/ERC20.sol
@@ -15,15 +15,15 @@
   limitations under the License.
 
 */
-pragma solidity 0.4.18;
+pragma solidity 0.4.19;
 
 
 /// @title ERC20 Token Interface
 /// @dev see https://github.com/ethereum/EIPs/issues/20
 /// @author Daniel Wang - <[email protected]>
 contract ERC20 {
     uint public totalSupply;
-	
+
     event Transfer(address indexed from, address indexed to, uint256 value);
     event Approval(address indexed owner, address indexed spender, uint256 value);
 
@@ -32,4 +32,4 @@ contract ERC20 {
     function transfer(address to, uint256 value) public returns (bool);
     function transferFrom(address from, address to, uint256 value) public returns (bool);
     function approve(address spender, uint256 value) public returns (bool);
-}
+}
diff --git a/contracts/lib/MathBytes32.sol b/contracts/lib/MathBytes32.sol
@@ -15,7 +15,7 @@
   limitations under the License.
 
 */
-pragma solidity 0.4.18;
+pragma solidity 0.4.19;
 
 
 /// @title Utility Functions for byte32

diff --git a/contracts/lib/MathUint.sol b/contracts/lib/MathUint.sol
@@ -15,7 +15,7 @@
   limitations under the License.
 
 */
-pragma solidity 0.4.18;
+pragma solidity 0.4.19;
 
 
 /// @title Utility Functions for uint

diff --git a/contracts/lib/MathUint8.sol b/contracts/lib/MathUint8.sol
@@ -15,7 +15,7 @@
   limitations under the License.
 
 */
-pragma solidity 0.4.18;
+pragma solidity 0.4.19;
 
 
 /// @title Utility Functions for uint8

diff --git a/contracts/lib/Ownable.sol b/contracts/lib/Ownable.sol
@@ -15,7 +15,7 @@
   limitations under the License.
 
 */
-pragma solidity 0.4.18;
+pragma solidity 0.4.19;
 
 
 /// @title Ownable
@@ -50,4 +50,4 @@ contract Ownable {
         OwnershipTransferred(owner, newOwner);
         owner = newOwner;
     }
-}
+}
diff --git a/contracts/test/DummyToken.sol b/contracts/test/DummyToken.sol
@@ -1,4 +1,4 @@
-pragma solidity 0.4.18;
+pragma solidity 0.4.19;
 
 import "zeppelin-solidity/contracts/token/ERC20/MintableToken.sol";
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -32,8 +32,8 @@
     "dirty-chai": "^2.0.0",
     "chai": "^2.2.1",
     "ganache-cli": "^6.0.3",
-    "truffle": "4.0.1",
-    "solc": "0.4.18",
+    "truffle": "4.1.3",
+    "solc": "0.4.19",
     "solium": "^1.1.5",
     "typescript": "2.4.2",
     "tslint": "5.8.0",